Skip to content

Commit

Permalink
fix koyeb dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
storytellerF committed Jan 28, 2025
1 parent c09b224 commit dafa44e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions Dockerfile.patched
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,7 @@ PRESET_ENCRYPTED_PASSWORD=${PRESET_ENCRYPTED_PASSWORD}
SNAPSHOT_KEYSTORE_PATH=${SNAPSHOT_KEYSTORE_PATH}
SNAPSHOT_KEYSTORE_PASS=${SNAPSHOT_KEYSTORE_PASS}
EOF
RUN cp ./${FLAVOR}.env ./build/envs/.env

RUN mkdir -p build/envs && cp ./${FLAVOR}.env ./build/envs/.env

RUN find scripts/ -type f \( -name "*.sh" -o -name "*.js" \) -exec sed -i 's/\r$//' {} + && \
sed -i 's/\r$//' gradlew
Expand Down
2 changes: 1 addition & 1 deletion scripts/tool_scripts/patch-koyeb-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ while IFS= read -r key; do
done < "$env_filter_file"

# 完成 COPY 块的 EOF 部分
replace_string_2+="EOF\nRUN cp ./\${FLAVOR}.env ./build/envs/.env\n"
replace_string_2+="EOF\nRUN mkdir -p build/envs \&\& cp ./\${FLAVOR}.env ./build/envs/.env"

# 使用 sed 替换 dockerfile 模板中的 #1 和 #2
sed -e "s|#1|$replace_string_1|" -e "s|#2|$replace_string_2|" -e "s|#3|$replace_string_3|" "$dockerfile_template" > "$dockerfile_output"
Expand Down

0 comments on commit dafa44e

Please sign in to comment.