fix: wrong field check, add new deploy's secrets

unconditionalday · Feb 12, 2024 · a436059 · a436059
1 parent af6026b
commit a436059
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -26,17 +26,24 @@ WORKDIR /data
 COPY --from=builder /app/main /app/main
 
 ARG UNCONDITIONAL_API_SOURCE_REPO
-ARG UNCONDITIONAL_API_LOG_ENV
-ENV UNCONDITIONAL_API_SOURCE_REPO=${UNCONDITIONAL_API_SOURCE_REPO}
-ENV UNCONDITIONAL_API_LOG_ENV=${UNCONDITIONAL_API_LOG_ENV}
+ARG UNCONDITIONAL_API_SOURCE_CLIENT_KEY
 ARG UNCONDITIONAL_API_FEED_REPO_INDEX
 ARG UNCONDITIONAL_API_FEED_REPO_HOST
 ARG UNCONDITIONAL_API_FEED_REPO_KEY
+ARG UNCONDITIONAL_API_LOG_ENV
+
+ENV UNCONDITIONAL_API_SOURCE_REPO=${UNCONDITIONAL_API_SOURCE_REPO}
+ENV UNCONDITIONAL_API_SOURCE_CLIENT_KEY=${UNCONDITIONAL_API_SOURCE_CLIENT_KEY}
 ENV UNCONDITIONAL_API_FEED_REPO_INDEX=${UNCONDITIONAL_API_FEED_REPO_INDEX}
 ENV UNCONDITIONAL_API_FEED_REPO_HOST=${UNCONDITIONAL_API_FEED_REPO_HOST}
 ENV UNCONDITIONAL_API_FEED_REPO_KEY=${UNCONDITIONAL_API_FEED_REPO_KEY}
+ENV UNCONDITIONAL_API_LOG_ENV=${UNCONDITIONAL_API_LOG_ENV}
 
-RUN /app/main index create --name ${UNCONDITIONAL_API_FEED_REPO_INDEX}
+RUN --mount=type=secret,id=UNCONDITIONAL_API_SOURCE_CLIENT_KEY \
+    --mount=type=secret,id=UNCONDITIONAL_API_FEED_REPO_KEY \
+    UNCONDITIONAL_API_SOURCE_CLIENT_KEY="$(cat /run/secrets/UNCONDITIONAL_API_SOURCE_CLIENT_KEY)" \
+    UNCONDITIONAL_API_FEED_REPO_KEY="$(cat /run/secrets/UNCONDITIONAL_API_FEED_REPO_KEY)" \
+    /app/main index create --name feeds
 
 FROM scratch as release
 COPY --from=certificator /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
@@ -63,4 +70,4 @@ ENV UNCONDITIONAL_API_FEED_REPO_INDEX=${UNCONDITIONAL_API_FEED_REPO_INDEX}
 ENV UNCONDITIONAL_API_FEED_REPO_HOST=${UNCONDITIONAL_API_FEED_REPO_HOST}
 ENV UNCONDITIONAL_API_FEED_REPO_KEY=${UNCONDITIONAL_API_FEED_REPO_KEY}
 
-ENTRYPOINT ["./app/main","serve", "--address", "0.0.0.0", "--port","8080", "--index","/data/index"]
+ENTRYPOINT ["./app/main","serve", "--address", "0.0.0.0", "--port","8080"]
diff --git a/cmd/index/create.go b/cmd/index/create.go
@@ -40,7 +40,7 @@ func NewCreateCommand() *cobra.Command {
 			}
 
 			frk := cobrax.Flag[string](cmd, "feed-repo-key").(string)
-			if i == "" {
+			if frk == "" {
 				return ErrFeedRepoKeyNotProvided
 			}
 

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -8,6 +8,10 @@ if ! command -v flyctl &> /dev/null; then
 fi
 
 # Deploy
-flyctl deploy --build-secret UNCONDITIONAL_API_SOURCE_CLIENT_KEY="$UNCONDITIONAL_API_SOURCE_CLIENT_KEY" \
-              --build-arg UNCONDITIONAL_API_BUILD_COMMIT_VERSION="$UNCONDITIONAL_API_BUILD_COMMIT_VERSION" \
-              --build-arg UNCONDITIONAL_API_BUILD_RELEASE_VERSION="$UNCONDITIONAL_API_BUILD_RELEASE_VERSION" \
+flyctl deploy \
+  --build-secret UNCONDITIONAL_API_SOURCE_CLIENT_KEY="$UNCONDITIONAL_API_SOURCE_CLIENT_KEY" \
+  --build-secret UNCONDITIONAL_API_FEED_REPO_KEY="$UNCONDITIONAL_API_FEED_REPO_KEY" \
+  --build-arg UNCONDITIONAL_API_FEED_REPO_HOST="$UNCONDITIONAL_API_FEED_REPO_HOST" \
+  --build-arg UNCONDITIONAL_API_FEED_REPO_INDEX="$UNCONDITIONAL_API_FEED_REPO_INDEX" \
+  --build-arg UNCONDITIONAL_API_BUILD_COMMIT_VERSION="$UNCONDITIONAL_API_BUILD_COMMIT_VERSION" \
+  --build-arg UNCONDITIONAL_API_BUILD_RELEASE_VERSION="$UNCONDITIONAL_API_BUILD_RELEASE_VERSION"