Release October 26th 2023

.github/workflows/create_packages.yml

@@ -1,50 +1,109 @@
 name: Create packages
 on:
-  pull_request:
+  push:
     branches:
-      - main
-    types:
-      - closed
-
+    - develop
+    - main
 
 jobs:
-  main:
-    if: github.event.pull_request.merged == true
+  tag:
+    name: generate tag
+    outputs:
+      part: ${{ steps.generate_tag.outputs.part }}
+      tag: ${{ steps.generate_tag.outputs.tag }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: '1'
+    - name: Generate new tag
+      id: generate_tag
+      uses: anothrNick/github-tag-action@1.61.0
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        WITH_V: true
+        DEFAULT_BUMP: ${{ github.ref_name == 'develop' && 'patch' ||  'minor' }}
+        DRY_RUN: true
+
+  push_to_registry:
+    strategy:
+      matrix:
+        include:
+          - web_url: "https://urdr.nbis.se"
+            redmine_url: "https://projects.nbis.se"
+            env: "prod"
+          - web_url: "https://urdr-test.nbis.se"
+            redmine_url: "https://urdr-test-redmine.nbis.se"
+            env: "test"
+    needs: tag
+    if: needs.tag.outputs.part != ''
+    name: Push Docker image to Github Container registry
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Build and push images
-        working-directory: production
-        env:
-          DOCKER_BUILDKIT: 1
-          COMPOSE_DOCKER_CLI_BUILD: 1
-          GH_ACTOR: ${{ github.actor }}
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GH_HEAD_REF: ${{ github.head_ref }}
-        run: |
-             echo "${GH_TOKEN}" | docker login ghcr.io -u "${GH_ACTOR}" --password-stdin
-             branch="${GH_HEAD_REF}"
-
-             for image in urdr urdr-web; do
-               docker pull "ghcr.io/nbisweden/$image:latest" || true
-               docker pull "ghcr.io/nbisweden/$image:$branch" || true
-             done
-
-             cat > urdr.env <<END
-             PUBLIC_API_URL="https://urdr.nbis.se"
-             PUBLIC_REDMINE_URL="https://projects.nbis.se"
-             END
-
-             TAG="$branch" docker-compose --env-file urdr.env build --build-arg BUILDKIT_INLINE_CACHE=1
-
-             for image in urdr urdr-web; do
-               docker push "ghcr.io/nbisweden/$image:$branch"
-               docker tag "ghcr.io/nbisweden/$image:$branch" "ghcr.io/nbisweden/$image:latest"
-               docker push "ghcr.io/nbisweden/$image:latest"
-             done
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Log in to the Github Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/nbisweden/urdr
+            ghcr.io/nbisweden/urdr-web
+
+      - name: Build and push urdr
+        uses: docker/build-push-action@v5
+        with:
+          context: ./backend
+          file: ./production/Dockerfile
+          push: true
+          tags: |
+            ghcr.io/nbisweden/urdr:${{ matrix.env == 'prod' && needs.tag.outputs.tag || format('{0}-test', needs.tag.outputs.tag) }}
+            ghcr.io/nbisweden/urdr:latest
+          labels: |
+            org.opencontainers.image.source=${{ github.event.repository.clone_url }}
+            org.opencontainers.image.created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+            org.opencontainers.image.revision=${{ github.sha }}
+
+      - name: Build and push urdr-web
+        uses: docker/build-push-action@v5
+        with:
+          context: ./frontend
+          file: ./production/Dockerfile.nginx
+          build-args: |
+            PUBLIC_API_URL=${{ matrix.web_url }}
+            PUBLIC_REDMINE_URL=${{ matrix.redmine_url }}
+          push: true
+          tags: |
+            ghcr.io/nbisweden/urdr-web:${{ matrix.env == 'prod' && needs.tag.outputs.tag || format('{0}-test', needs.tag.outputs.tag) }}
+            ghcr.io/nbisweden/urdr-web:latest
+          labels: |
+            org.opencontainers.image.source=${{ github.event.repository.clone_url }}
+            org.opencontainers.image.created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+            org.opencontainers.image.revision=${{ github.sha }}
+
+  publish_tag:
+    name: publish tag
+    needs: [push_to_registry, tag]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: '1'
+    - name: Push tag
+      id: push_tag
+      uses: anothrNick/github-tag-action@1.61.0
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CUSTOM_TAG: ${{ needs.tag.outputs.tag }}

backend/go.mod

@@ -3,7 +3,7 @@ module urdr-api
 go 1.20
 
 require (
-	github.com/gofiber/fiber/v2 v2.47.0
+	github.com/gofiber/fiber/v2 v2.49.2
 	github.com/gofiber/storage/sqlite3 v1.3.7
 	github.com/mattn/go-sqlite3 v1.14.17
 	github.com/sirupsen/logrus v1.9.0
@@ -20,25 +20,21 @@ require (
 	github.com/go-openapi/jsonreference v0.19.6 // indirect
 	github.com/go-openapi/spec v0.20.4 // indirect
 	github.com/go-openapi/swag v0.21.1 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
-	github.com/klauspost/compress v1.16.3 // indirect
+	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/mattn/go-runewidth v0.0.14 // indirect
-	github.com/philhofer/fwd v1.1.2 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 // indirect
-	github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect
 	github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe // indirect
-	github.com/tinylib/msgp v1.1.8 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasthttp v1.47.0 // indirect
+	github.com/valyala/fasthttp v1.49.0 // indirect
 	github.com/valyala/tcplisten v1.0.0 // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/sys v0.9.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/tools v0.7.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )