ci: test

Author: mariuswinger

.github/workflows/tests.yaml

@@ -11,8 +11,7 @@ on:
 
 env:
   REGISTRY: ghcr.io
-  API_IMAGE_PATH: ${{ github.repository }}/api
-  WEB_IMAGE_PATH: ${{ github.repository }}/web
+  API_IMAGE_NAME: api
 
 jobs:
   api-unit-tests:
@@ -42,6 +41,9 @@ jobs:
       - name: "Setup: checkout repository"
         uses: actions/checkout@v4
 
+      - name: "Setup: Set image name"
+        run: echo "API_IMAGE=${{ env.REGISTRY }}/${{ github.repository }}/${{ env.API_IMAGE_NAME }}" >> "$GITHUB_ENV"
+
       - name: "Setup: Login to GitHub Container Registry"
         uses: docker/login-action@v3
         with:
@@ -51,20 +53,16 @@ jobs:
 
       # - name: "Setup: Docker Buildx"
       #   uses: docker/setup-buildx-action@v3
-      #
-      # - name: "Setup: Build API image"
-      #   uses: docker/build-push-action@v6
-      #   with:
-      #     context: ./api
-      #     target: development
-      #     load: true
-      #     tags: ${{ env.REGISTRY }}/${{ env.API_IMAGE_PATH }}:buildcache
-      #     cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.API_IMAGE_PATH }}:buildcache
 
-      # - name: Build API image
-      #   run: |
-      #     docker pull $API_IMAGE
-      #     docker build --target development --tag api-development ./api # TODO: --cache-from $API_IMAGE
+      - name: "Setup: Build API image"
+        uses: docker/build-push-action@v6
+        with:
+          context: ./api
+          target: development
+          load: true
+          tags: ${{ env.API_IMAGE }}:dev
+          cache-from: type=registry,ref=${{ env.API_IMAGE }}:dev
+          # cache-to: type=registry,ref=${{ env.API_IMAGE }}:dev,mode=max
 
       - name: Pytest Integration tests
         run: docker compose -f docker-compose.yml -f docker-compose.ci.yml run --rm api python -m pytest --integration
@@ -75,23 +73,27 @@ jobs:
 
   web-tests:
     runs-on: ubuntu-latest
+    if: ${{ false }} # disable for now as they do not currently work
     steps:
-      - uses: actions/checkout@v4
+      - name: "Setup: checkout repository"
+        uses: actions/checkout@v4
 
-      - name: "Login to GitHub Container Registry"
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+      # - name: "Login to GitHub Container Registry"
+      #   uses: docker/login-action@v3
+      #   with:
+      #     registry: ${{ env.REGISTRY }}
+      #     username: ${{ github.actor }}
+      #     password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build Web Image
-        run: |
-          docker pull ${REGISTRY}/${WEB_IMAGE_PATH}
-          docker build --cache-from ${REGISTRY}/${WEB_IMAGE_PATH} --target development --tag web-dev ./web
+      - name: "Setup: Build web image"
+        uses: docker/build-push-action@v6
+        with:
+          context: ./web
+          target: development
+          load: true
+          tags: web:dev
 
       - name: Run Web tests
-        if: ${{ false }} # disable for now as they do not currently work
         run: docker compose -f docker-compose.yml -f docker-compose.ci.yml run --rm web yarn test
 
   docs-tests:

docker-compose.ci.yml

@@ -1,7 +1,6 @@
 services:
   api:
-    image: ghcr.io/equinor/template-fastapi-react/api:latest
-    # image: api-development
+    image: ghcr.io/equinor/template-fastapi-react/api:dev
     build:
       target: development
     environment:
@@ -13,11 +12,14 @@ services:
       MONGODB_PORT: 27017
       SECRET_KEY: sg9aeUM5i1JO4gNN8fQadokJa3_gXQMLBjSGGYcfscs=
       AUTH_ENABLED: "False"
-    depends_on:
-      - db
     links:
       - db
 
+  nginx:
+    image: web:dev
+    build:
+      target: development
+
   db:
     environment:
       MONGO_INITDB_ROOT_USERNAME: root