Merge pull request #115 from sineverba/fix-linux-platform

Fix Docker platforms
sineverba · Jan 15, 2024 · 19ab962 · 19ab962
2 parents ffefd1a + da4c79c
commit 19ab962
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/.semaphore/build.yml b/.semaphore/build.yml
@@ -42,10 +42,9 @@ blocks:
               > ~/.docker/cli-plugins/docker-buildx
             - chmod a+x ~/.docker/cli-plugins/docker-buildx
             - docker buildx create --name multiarch --use
-            - docker buildx inspect --bootstrap --builder multiarch
             - >-
               docker buildx build 
-              --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8 
+              --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 
               --build-arg NODE_VERSION=$NODE_VERSION 
               --build-arg NPM_VERSION=$NPM_VERSION 
               --build-arg NGINX_VERSION=$NGINX_VERSION 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
-# 1.2.0
+# 1.2.1
++ Fix Docker architecture
+
+## 1.2.0
 + Upgrade dependencies
 + Move v1 to the code
 + Remove servers inside tests

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ include .env
 
 IMAGE_NAME=registry.gitlab.com/cicdprojects/online-banking-frontend
 CONTAINER_NAME=online-banking-frontend
-APP_VERSION=1.2.0-dev
+APP_VERSION=1.2.1-dev
 NODE_VERSION=20.11.0
 NPM_VERSION=10.3.0
 NGINX_VERSION=1.25.3
@@ -50,8 +50,12 @@ build:
 
 multi:
 	docker buildx build \
-		--platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7 \
+		--platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 \
+		--build-arg NODE_VERSION=$(NODE_VERSION) \
+		--build-arg NPM_VERSION=$(NPM_VERSION) \
+		--build-arg NGINX_VERSION=$(NGINX_VERSION) \
 		--tag $(IMAGE_NAME):$(APP_VERSION) \
+		--tag $(IMAGE_NAME):latest \
 		--push \
 		--file dockerfiles/production/build/docker/Dockerfile "."
 

diff --git a/dockerfiles/production/deploy/docker-compose.yml b/dockerfiles/production/deploy/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   online-banking-frontend:
-    image: registry.gitlab.com/cicdprojects/online-banking-frontend:1.2.0
+    image: registry.gitlab.com/cicdprojects/online-banking-frontend:1.2.1
     container_name: ${CONTAINER_NAME}
     restart: unless-stopped
     env_file:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "online-banking-frontend",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": true,
   "dependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,5 +1,5 @@
 sonar.projectKey=online-banking-frontend
-sonar.projectVersion=1.2.0
+sonar.projectVersion=1.2.1
 sonar.organization=sineverba
 sonar.sources=src
 sonar.exclusions=**/node_modules/**,src/scss/**,src/setupTests.js,src/__tests__/**,src/assets/**