Set correct build-args syntax + fix amazon image (#337)

* Set correct build-args syntax + fix amazon image * Remove added quotes
raito-io · May 3, 2024 · cfc1373 · cfc1373
1 parent 912e2e3
commit cfc1373
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,9 +37,9 @@ jobs:
         env:
           goreleaser_meta: ${{ steps.goreleaser.outputs.metadata }}
         run: |
-          version=$( echo $goreleaser_meta | jq '.version' )
-          commit=$( echo $goreleaser_meta | jq '.commit' )
-          date=$( echo $goreleaser_meta | jq '.date' )
+          version=$( echo $goreleaser_meta | jq -r '.version' )
+          commit=$( echo $goreleaser_meta | jq -r '.commit' )
+          date=$( echo $goreleaser_meta | jq -r '.date' )
 
           echo "version=$version" >> $GITHUB_OUTPUT
           echo "commit=$commit" >> $GITHUB_OUTPUT
@@ -85,8 +85,8 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           build-args: |
-            VERSION:${{ steps.goreleaser_meta_parser.outputs.version }}
-            COMMIT_DATE:${{ steps.goreleaser_meta_parser.outputs.date }}
+            VERSION=${{ steps.goreleaser_meta_parser.outputs.version }}
+            COMMIT_DATE=${{ steps.goreleaser_meta_parser.outputs.date }}
           context: .
           target: deploy
           push: true
@@ -119,8 +119,8 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           build-args: |
-            VERSION:${{ steps.goreleaser_meta_parser.outputs.version }}
-            COMMIT_DATE:${{ steps.goreleaser_meta_parser.outputs.date }}
+            VERSION=${{ steps.goreleaser_meta_parser.outputs.version }}
+            COMMIT_DATE=${{ steps.goreleaser_meta_parser.outputs.date }}
           context: .
           target: amazonlinux
           push: true

diff --git a/Dockerfile b/Dockerfile
@@ -61,7 +61,8 @@ RUN mkdir -p /config
 ENV TZ=Etc/UTC
 ENV CLI_CRON="0 2 * * *"
 
-RUN groupadd -r raito && useradd -r -g raito raito
+RUN groupadd -r raito && useradd -d /home/raito -g raito raito
+
 RUN chown raito:raito /config
 
 COPY --from=build /app/raito /raito