Use docker image pull to pull from GHCR

MaMpf-HD · Jan 28, 2025 · 020aa58 · 020aa58
1 parent 9d50fc2
commit 020aa58
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Build and push docker image
+      - name: Build and push docker image to GHCR
         working-directory: docker/test
         run: >
           docker buildx bake
@@ -67,16 +67,10 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Pull docker image
+      - name: Pull MaMpf image (from GHCR)
         working-directory: docker/test
         run: >
-          docker compose
-          -f docker-compose.yml -f docker-compose.cicd.yml
-          -f ./../../.github/workflows/docker-compose-cache.json
-          pull mampf
+          docker image pull ghcr.io/mampf-hd/mampf-test:cache
 
       - name: Run unit tests
         working-directory: docker/test
@@ -106,9 +100,6 @@ jobs:
         with:
             submodules: recursive
 
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       # see https://github.com/orgs/MaMpf-HD/packages?repo_name=mampf
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -117,13 +108,10 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Pull docker image
+      - name: Pull MaMpf image (from GHCR)
         working-directory: docker/test
         run: >
-          docker compose
-          -f docker-compose.yml -f docker-compose.cicd.yml
-          -f ./../../.github/workflows/docker-compose-cache.json
-          pull mampf
+          docker image pull ghcr.io/mampf-hd/mampf-test:cache
 
       - name: Run Cypress tests
         working-directory: docker/test

diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
@@ -80,7 +80,7 @@ RUN if [ "$IN_CI_CD" = "true" ]; then \
 # (NODE_ENVtest-ci to trigger respective webpacker.yml section)
 COPY . /usr/src/app/
 RUN if [ "$IN_CI_CD" = "true" ]; then \
-        echo "Compiling MaMpf assets in CI/CD"; \
+        echo "Compiling MaMpf assets in pipeline"; \
         set -o allexport; . ./docker/production/docker.env; set +o allexport; \
         SECRET_KEY_BASE="$(bundle exec rails secret)" \
         DB_ADAPTER=nulldb NODE_ENV=test-ci bundle exec rails assets:precompile; \