From 0151c1cb552ef10bb13b498fb018e50c11d14772 Mon Sep 17 00:00:00 2001 From: elraphty Date: Thu, 5 Sep 2024 17:19:47 +0100 Subject: [PATCH] change build versions --- .github/workflows/docker-build-on-master.yml | 6 +++--- .github/workflows/docker-build.yml | 11 +++++------ docker/docker-compose.yml | 6 +++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker-build-on-master.yml b/.github/workflows/docker-build-on-master.yml index 8bba45a8f..eee5ccc85 100644 --- a/.github/workflows/docker-build-on-master.yml +++ b/.github/workflows/docker-build-on-master.yml @@ -15,11 +15,11 @@ jobs: ACTIONS_ALLOW_UNSECURE_COMMANDS: true steps: - name: Check out from Git - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Login to Docker Hub run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin - name: Checkout project - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Docker buildx action uses: crazy-max/ghaction-docker-buildx@v1 id: buildx @@ -29,7 +29,7 @@ jobs: - name: Show available buildx platforms run: echo ${{ steps.buildx.outputs.platforms }} - name: Cache Docker layers - uses: actions/cache@v2 + uses: actions/cache@v4 id: cache with: path: /tmp/.buildx-cache diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index a61adc3c4..0e698f0d9 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -5,17 +5,17 @@ env: on: push: tags: - - '*' + - "*" jobs: build: runs-on: ubuntu-20.04 - name: Build and push Tribes image + name: Build and push Tribes image env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true steps: - name: Check out from Git - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Test env run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - name: Test print env @@ -25,7 +25,7 @@ jobs: - name: Login to Docker Hub run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin - name: Checkout project - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Docker buildx action uses: crazy-max/ghaction-docker-buildx@v1 id: buildx @@ -35,7 +35,7 @@ jobs: - name: Show available buildx platforms run: echo ${{ steps.buildx.outputs.platforms }} - name: Cache Docker layers - uses: actions/cache@v2 + uses: actions/cache@v4 id: cache with: path: /tmp/.buildx-cache @@ -55,4 +55,3 @@ jobs: --tag "${{ secrets.DOCKER_HUB_USER }}/sphinx-tribes:${{ env.RELEASE_TAG }}" \ --tag "${{ secrets.DOCKER_HUB_USER }}/sphinx-tribes:latest" \ --output "type=registry" ./ - diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 96421c1c0..9d955e825 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -19,7 +19,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock - /home/ec2-user/sphinx-deploy/traefik.yaml:/etc/traefik/traefik.yaml - /home/ec2-user/letsencrypt:/letsencrypt - environment: + environment: - AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID - AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY - AWS_REGION=$AWS_REGION @@ -44,7 +44,7 @@ services: - "traefik.http.routers.auth.tls.certresolver=myresolver" - "traefik.http.routers.auth.entrypoints=websecure" restart: on-failure - environment: + environment: - JWT_KEY=$JWT_KEY - CLIENT_KEYS=$CLIENT_KEYS - OAUTH_TIMEOUT=$OAUTH_TIMEOUT @@ -62,7 +62,7 @@ services: - "traefik.http.routers.tribes.tls.certresolver=myresolver" - "traefik.http.routers.tribes.entrypoints=websecure" restart: on-failure - environment: + environment: - DATABASE_URL=$DATABASE_URL - PODCAST_INDEX_SECRET=$PODCAST_INDEX_SECRET - PODCAST_INDEX_KEY=$PODCAST_INDEX_KEY