From 875c6eaa5ee787af5b26a533aad5e5673548f95e Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 15 Mar 2023 16:17:05 +0900 Subject: [PATCH] Use dockerhub instead of ghcr --- .github/workflows/docker.yml | 11 ++++---- docker-compose.prod.yml | 55 ++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 docker-compose.prod.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d917458c..ab5708d5 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -15,10 +15,10 @@ jobs: include: - context: ./back label: back - image: ghcr.io/${{github.repository_owner}}/kyoo_back + image: zoriya/kyoo_back - context: ./front label: front - image: ghcr.io/${{github.repository_owner}}/kyoo_front + image: zoriya/kyoo_front name: Build ${{matrix.label}} steps: - uses: actions/checkout@v2 @@ -48,11 +48,10 @@ jobs: uses: docker/setup-buildx-action@v1 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v1 with: - registry: ghcr.io - username: ${{github.repository_owner}} - password: ${{secrets.GITHUB_TOKEN}} + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and push id: docker_build diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml new file mode 100644 index 00000000..b05e4a1b --- /dev/null +++ b/docker-compose.prod.yml @@ -0,0 +1,55 @@ +version: "3.8" + +services: + back: + image: zoryia/kyoo_back:edge + restart: on-failure + environment: + - KYOO_DATADIR=/var/lib/kyoo + - DATABASE__ENABLED=postgres + - DATABASE__CONFIGURATIONS__POSTGRES__SERVER=postgres + - DATABASE__CONFIGURATIONS__POSTGRES__USER=${POSTGRES_USER} + - DATABASE__CONFIGURATIONS__POSTGRES__PASSWORD=${POSTGRES_PASSWORD} + - DATABASE__CONFIGURATIONS__POSTGRES__DATABASE=${POSTGRES_DB} + - TVDB__APIKEY=${TVDB__APIKEY} + - THEMOVIEDB__APIKEY=${THEMOVIEDB__APIKEY} + - LIBRARY_ROOT=/video + depends_on: + - postgres + volumes: + - kyoo:/var/lib/kyoo + - ./cache:/var/lib/kyoo/cached + - ./video:/video + front: + image: zoriya/kyoo_front:edge + restart: on-failure + environment: + - KYOO_URL=${KYOO_URL:-http://back:5000} + - PUBLIC_BACK_URL=${PUBLIC_BACK_URL} + ingress: + image: nginx + restart: on-failure + environment: + - PORT=8901 + - FRONT_URL=http://front:8901 + - BACK_URL=${KYOO_URL:-http://back:5000} + volumes: + - ./nginx.conf.template:/etc/nginx/templates/kyoo.conf.template:ro + depends_on: + - back + - front + ports: + - "8901:8901" + postgres: + image: postgres + restart: on-failure + environment: + - POSTGRES_USER=${POSTGRES_USER} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - POSTGRES_DB=${POSTGRES_DB} + volumes: + - db:/var/lib/postgresql/data + +volumes: + kyoo: + db: