Merge branch 'update-fs25' into 'main'

Change sample app colors

See merge request !4

.gitlab-ci.yml

@@ -24,15 +24,15 @@ release:
     entrypoint: [""]
   before_script:
     - mkdir -p /kaniko/.docker
-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - echo "{\"auths\":{\"$CI_DEPENDENCY_PROXY_SERVER\":{\"username\":\"$CI_DEPENDENCY_PROXY_USER\",\"password\":\"$CI_DEPENDENCY_PROXY_PASSWORD\"}}}" > /kaniko/.docker/config.json
   script:
     # backend
-    - /kaniko/executor --context $CI_PROJECT_DIR/src --dockerfile $CI_PROJECT_DIR/backend.Dockerfile --destination $COMMENT_IMAGE:latest --build-arg SERVICE_INIT=comment
-    - /kaniko/executor --context $CI_PROJECT_DIR/src --dockerfile $CI_PROJECT_DIR/backend.Dockerfile --destination $DESCRIPTION_IMAGE:latest --build-arg SERVICE_INIT=description
-    - /kaniko/executor --context $CI_PROJECT_DIR/src --dockerfile $CI_PROJECT_DIR/backend.Dockerfile --destination $MOVIE_IMAGE:latest --build-arg SERVICE_INIT=movie
+    - /kaniko/executor --context $CI_PROJECT_DIR/src --dockerfile $CI_PROJECT_DIR/backend.Dockerfile --destination $COMMENT_IMAGE:latest --build-arg SERVICE_INIT=comment --build-arg IMAGE_CACHE=$CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/
+    - /kaniko/executor --context $CI_PROJECT_DIR/src --dockerfile $CI_PROJECT_DIR/backend.Dockerfile --destination $DESCRIPTION_IMAGE:latest --build-arg SERVICE_INIT=description --build-arg IMAGE_CACHE=$CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/
+    - /kaniko/executor --context $CI_PROJECT_DIR/src --dockerfile $CI_PROJECT_DIR/backend.Dockerfile --destination $MOVIE_IMAGE:latest --build-arg SERVICE_INIT=movie --build-arg IMAGE_CACHE=$CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/
     # frontend
-    - /kaniko/executor --context $CI_PROJECT_DIR/src --dockerfile $CI_PROJECT_DIR/frontend.Dockerfile --destination $FRONTEND_IMAGE:latest
-    - /kaniko/executor --context $CI_PROJECT_DIR/src --dockerfile $CI_PROJECT_DIR/frontend.Dockerfile --destination $FRONTEND_IMAGE_DARK:latest --build-arg DARK_MODE_INIT=true
+    - /kaniko/executor --context $CI_PROJECT_DIR/src --dockerfile $CI_PROJECT_DIR/frontend.Dockerfile --destination $FRONTEND_IMAGE:latest --build-arg IMAGE_CACHE=$CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/
+    - /kaniko/executor --context $CI_PROJECT_DIR/src --dockerfile $CI_PROJECT_DIR/frontend.Dockerfile --destination $FRONTEND_IMAGE_DARK:latest --build-arg DARK_MODE_INIT=true --build-arg IMAGE_CACHE=$CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/
 
 # release tag image
 retag_images:

backend.Dockerfile

-FROM golang:1.22.2 AS build
+ARG IMAGE_CACHE
+FROM ${IMAGE_CACHE}golang:1.22.2 AS build
 
 ARG SERVICE_INIT
 
@@ -13,13 +14,9 @@ RUN go mod download
 RUN CGO_ENABLED=0 go build -o executable ${SERVICE}.go
 
 
-# Multi stage with build-arg seems not to work with kaniko
 #FROM scratch
-
 #ARG SERVICE=${SERVICE_INIT}
-
 #WORKDIR /
-
 #COPY --from=build /${SERVICE} .
 COPY ./${SERVICE}/db.json .
 

frontend.Dockerfile

-FROM golang:1.22.2 AS build
+ARG IMAGE_CACHE
+FROM ${IMAGE_CACHE}golang:1.22.2 AS build
 
 ARG DARK_MODE_INIT=false
 
@@ -13,7 +14,6 @@ RUN go mod download
 RUN CGO_ENABLED=0 go build -o frontend frontend.go
 
 
-# Multi stage with build-arg seems not to work with kaniko
 #FROM scratch
 #WORKDIR /
 #COPY --from=build /frontend .

src/frontend/static/frontend.style.css

 :root {
-  --color-primary: #666239;
-  --color-palett-b: #E6E2C5;
-  --color-palett-c: #E0D77E;
-  --color-palett-d: #4d4c42;
-  --color-palett-e: #ADA561;
+  --color-primary: #b455fa;
+  --color-palett-b: #efbbff;
+  --color-palett-c: #d896ff;
+  --color-palett-d: #660066;
+  --color-palett-e: #800080;
   --white: #fff;
   --black: #000;
   --grey: #aaa;
@@ -39,7 +39,7 @@ h2 {
 
 .movie {
   display: grid;
-  grid-template-areas: 
+  grid-template-areas:
     "image aside aside"
     "directed budget runtime";
     background-color: var(--color-palett-b);