From 81df71416c54c2431e031b5365505698e8f6dd76 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 26 Jan 2024 10:52:58 +0100 Subject: [PATCH] Update Docker images and add pull_policy --- .github/workflows/production-build.yml | 2 +- docker-compose.dev.yml | 6 ++++++ docker-compose.windows.yml | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/production-build.yml b/.github/workflows/production-build.yml index 559145269..f386de25f 100644 --- a/.github/workflows/production-build.yml +++ b/.github/workflows/production-build.yml @@ -78,7 +78,7 @@ jobs: echo "VERSION=$(docker run --rm -v "$(pwd):/app" -w /app php:8.2-alpine3.16 php bootstrap/getVersion.php)"|xargs >> $GITHUB_OUTPUT - name: Create & publish manifest run: | - docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} + docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest - uses: sarisia/actions-status-discord@v1 if: always() with: diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index c723ef013..6d76a9abd 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -22,6 +22,7 @@ services: volumes: - .:/var/www/html/:cached postgres: + pull_policy: always ports: - "${FORWARD_DB_PORT:-5432}:5432" env_file: @@ -35,6 +36,7 @@ services: - /data/coolify/_volumes/database/:/var/lib/postgresql/data # - coolify-pg-data-dev:/var/lib/postgresql/data redis: + pull_policy: always ports: - "${FORWARD_REDIS_PORT:-6379}:6379" env_file: @@ -54,6 +56,7 @@ services: SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET:-coolify}" vite: image: node:20 + pull_policy: always working_dir: /var/www/html # environment: # VITE_PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}" @@ -66,6 +69,7 @@ services: - coolify testing-host: image: "ghcr.io/coollabsio/coolify-testing-host:latest" + pull_policy: always init: true container_name: coolify-testing-host volumes: @@ -76,6 +80,7 @@ services: - coolify mailpit: image: "axllent/mailpit:latest" + pull_policy: always container_name: coolify-mail ports: - "${FORWARD_MAILPIT_PORT:-1025}:1025" @@ -84,6 +89,7 @@ services: - coolify minio: image: minio/minio:latest + pull_policy: always container_name: coolify-minio command: server /data --console-address ":9001" ports: diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml index 750f6eaa9..7d5a57792 100644 --- a/docker-compose.windows.yml +++ b/docker-compose.windows.yml @@ -3,12 +3,14 @@ services: coolify-testing-host: init: true image: "ghcr.io/coollabsio/coolify-testing-host:latest" + pull_policy: always container_name: coolify-testing-host volumes: - //var/run/docker.sock://var/run/docker.sock - ./:/data/coolify coolify: - image: "ghcr.io/coollabsio/coolify:next" + image: "ghcr.io/coollabsio/coolify:latest" + pull_policy: always container_name: coolify restart: always working_dir: /var/www/html @@ -61,6 +63,7 @@ services: condition: service_healthy postgres: image: postgres:15-alpine + pull_policy: always container_name: coolify-db restart: always env_file: @@ -84,6 +87,7 @@ services: timeout: 2s redis: image: redis:alpine + pull_policy: always container_name: coolify-redis restart: always command: redis-server --save 20 1 --loglevel warning --requirepass ${REDIS_PASSWORD} @@ -100,6 +104,7 @@ services: timeout: 2s soketi: image: 'quay.io/soketi/soketi:1.6-16-alpine' + pull_policy: always container_name: coolify-realtime restart: always env_file: