浏览代码

Update sync Dockerfile to work with new version of Alpine

main
Sindre Stephansen 10 个月前
父节点
当前提交
1b4f4bd3e8
签署人:: sindre <sindre@sindrestephansen.com> GPG 密钥 ID: B06FC67D17A46ADE
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. +4
    -2
      sync/Dockerfile
  2. +2
    -2
      sync/resolve-deps.sh

+ 4
- 2
sync/Dockerfile 查看文件

@@ -17,10 +17,12 @@ RUN ./gradlew build

WORKDIR /workdir

RUN python3 -m ensurepip
RUN apk add py3-pip
RUN python3 -m venv /tmp/python-venv
ENV CUSTOMPYTHON=/tmp/python-venv/bin/python

COPY requirements.txt .
RUN python3 -m pip install -r requirements.txt
RUN /tmp/python-venv/bin/pip install -r requirements.txt

COPY resolve-deps.sh .
COPY src ./src


+ 2
- 2
sync/resolve-deps.sh 查看文件

@@ -42,8 +42,8 @@ export GRADLE_VERSIONS_DIR=/gradle-versions
mkdir -p "${GRADLE_VERSIONS_DIR}"

echo "Resolving packages and generating gradle config"
python3 --version
if ! python3 src/main.py --repo="http://repo:80/releases" --output-dir "$PROJECTS_DIR" /package-list.yaml; then
$CUSTOMPYTHON --version
if ! $CUSTOMPYTHON src/main.py -vv --repo="http://repo:80/releases" --output-dir "$PROJECTS_DIR" /package-list.yaml; then
echo "Gradle generation failed"
exit 255
fi


正在加载...
取消
保存