feat: upgrade github actions + extract frontend build away from docker

Author: gwleclerc

.dockerignore

@@ -1,7 +1,6 @@
 .cache/
 .git/
 .vscode/
-build/
 docs/
 node_modules/
 tests/

.github/workflows/main.yml

@@ -20,7 +20,7 @@ jobs:
       - id: nvm
         run: echo ::set-output name=NVMRC::$(cat .nvmrc)
 
-      - uses: actions/setup-node@v2.2.0
+      - uses: actions/setup-node@v3
         with:
           node-version: '${{ steps.nvm.outputs.NVMRC }}'
           cache: yarn
@@ -42,7 +42,7 @@ jobs:
       - id: nvm
         run: echo ::set-output name=NVMRC::$(cat .nvmrc)
 
-      - uses: actions/setup-node@v2.2.0
+      - uses: actions/setup-node@v3
         with:
           node-version: '${{ steps.nvm.outputs.NVMRC }}'
           cache: yarn
@@ -78,7 +78,7 @@ jobs:
       - id: nvm
         run: echo ::set-output name=NVMRC::$(cat .nvmrc)
 
-      - uses: actions/setup-node@v2.2.0
+      - uses: actions/setup-node@v3
         with:
           node-version: '${{ steps.nvm.outputs.NVMRC }}'
           cache: yarn
@@ -88,13 +88,6 @@ jobs:
         with:
           go-version: '^1.21.1'
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          platforms: linux/amd64,linux/arm64
-
       - run: yarn install --frozen-lockfile
 
       - name: Build
@@ -104,20 +97,11 @@ jobs:
           make VERSION=${{ steps.extract_ref.outputs.GIT_REF }} start-docker
 
       - if: startsWith(github.ref, 'refs/tags/')
-        run: make save-docker
-
-      - if: startsWith(github.ref, 'refs/tags/')
-        uses: actions/[email protected]
+        uses: actions/upload-artifact@v3
         with:
           name: smocker-bin
           path: ./build/smocker.tar.gz
 
-      - if: startsWith(github.ref, 'refs/tags/')
-        uses: actions/[email protected]
-        with:
-          name: smocker-docker
-          path: /tmp/smocker.tar
-
   deploy:
     needs: [lint, test, build]
     if: startsWith(github.ref, 'refs/tags/')
@@ -128,30 +112,31 @@ jobs:
       - id: extract_ref
         run: echo ::set-output name=GIT_REF::$(echo ${GITHUB_REF##*/})
 
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: smocker-bin
           path: ./build
 
-      - uses: actions/download-artifact@v2
-        with:
-          name: smocker-docker
-          path: /tmp
-
-      - run: make VERSION=${{ steps.extract_ref.outputs.GIT_REF }} load-docker
+      - run: cd build && tar -xvf smocker.tar.gz
 
       - name: Docker login
-        uses: docker/login-action@v1.10.0
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
+
       - name: Deploy on Docker registry
         run: make VERSION=${{ steps.extract_ref.outputs.GIT_REF }} deploy-docker
 
       - name: Deploy on GitHub releases
-        uses: softprops/action-gh-release@v0.1.5
+        uses: softprops/action-gh-release@v1
         with:
           files: build/smocker.tar.gz
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          token: ${{ secrets.GH_TOKEN }}

Dockerfile

@@ -9,18 +9,9 @@ COPY Makefile main.go ./
 COPY server/ ./server/
 RUN make VERSION=$VERSION COMMIT=$COMMIT RELEASE=1 build
 
-FROM node:16-bullseye AS build-frontend
-WORKDIR /wd
-ENV PARCEL_WORKERS 1
-COPY package.json yarn.lock ./
-RUN yarn install --frozen-lockfile --ignore-scripts --network-timeout 300000
-COPY tsconfig.json ./
-COPY client/ ./client/
-RUN yarn build
-
 FROM alpine
 WORKDIR /opt
 EXPOSE 8080 8081
+COPY build/client client/
 COPY --from=build-backend /go/src/github.com/Thiht/smocker/build/* /opt/
-COPY --from=build-frontend /wd/build/* /opt/
 CMD ["/opt/smocker"]

Makefile

@@ -108,7 +108,7 @@ clean:
 
 .PHONY: build-docker
 build-docker:
-	docker buildx build --build-arg VERSION=$(VERSION) --build-arg COMMIT=$(COMMIT) --tag $(DOCKER_IMAGE):latest --platform linux/arm64,linux/amd64 .
+	docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT=$(COMMIT) --tag $(DOCKER_IMAGE):latest .
 	docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE):$(DOCKER_TAG)
 
 .PHONY: start-docker
@@ -129,9 +129,9 @@ optimize:
 
 build/smocker.tar.gz:
 	$(MAKE) build
-	yarn install --frozen-lockfile --ignore-scripts --network-timeout 300000
+	yarn install --frozen-lockfile --ignore-scripts
 	yarn build
-	cd build/; tar cvf smocker.tar.gz *
+	cd build/; tar -cvf smocker.tar.gz *
 
 .PHONY: release
 release: build/smocker.tar.gz
@@ -144,18 +144,10 @@ start-release: clean build/smocker.tar.gz
 start-caddy: $(CADDY)
 	$(CADDY) run
 
-.PHONY: save-docker
-save-docker:
-	docker save --output /tmp/smocker.tar $(DOCKER_IMAGE):latest
-
-.PHONY: load-docker
-load-docker:
-	docker load --input /tmp/smocker.tar
-	docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE):$(DOCKER_TAG)
-
 .PHONY: deploy-docker
 deploy-docker:
+	docker run --rm --privileged multiarch/qemu-user-static --reset -p yes; docker buildx create --use
 ifdef IS_SEMVER
-	docker push $(DOCKER_IMAGE):latest
+	docker buildx build --push --build-arg VERSION=$(VERSION) --build-arg COMMIT=$(COMMIT) --tag $(DOCKER_IMAGE):latest --platform linux/arm/v7,linux/arm64/v8,linux/amd64 .
 endif
-	docker push $(DOCKER_IMAGE):$(DOCKER_TAG)
+	docker buildx build --push --build-arg VERSION=$(VERSION) --build-arg COMMIT=$(COMMIT) --tag $(DOCKER_IMAGE):$(DOCKER_TAG) --platform linux/arm/v7,linux/arm64/v8,linux/amd64 .

main.go

@@ -9,9 +9,7 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-var (
-	appName, buildVersion, buildCommit, buildDate string // nolint
-)
+var appName, buildVersion, buildCommit, buildDate string // nolint
 
 func parseConfig() (c config.Config) {
 	c.Build = config.Build{
@@ -28,7 +26,7 @@ func parseConfig() (c config.Config) {
 	flag.StringVar(&c.ConfigBasePath, "config-base-path", "/", "Base path applied to Smocker UI")
 	flag.IntVar(&c.ConfigListenPort, "config-listen-port", 8081, "Listening port of Smocker administration server")
 	flag.IntVar(&c.MockServerListenPort, "mock-server-listen-port", 8080, "Listening port of Smocker mock server")
-	flag.StringVar(&c.StaticFiles, "static-files", ".", "Location of the static files to serve (index.html, etc.)")
+	flag.StringVar(&c.StaticFiles, "static-files", "client", "Location of the static files to serve (index.html, etc.)")
 	flag.IntVar(&c.HistoryMaxRetention, "history-retention", 0, "Maximum number of calls to keep in the history per session (0 = no limit)")
 	flag.StringVar(&c.PersistenceDirectory, "persistence-directory", "", "If defined, the directory where the sessions will be synchronized")
 	flag.BoolVar(&c.TLSEnable, "tls-enable", false, "Enable TLS using the provided certificate")

package.json

@@ -17,7 +17,7 @@
   },
   "targets": {
     "default": {
-      "distDir": "./build",
+      "distDir": "./build/client",
       "publicUrl": "./assets"
     }
   },