fix building prepare img error: pip3 install setuptools

fphub · Jun 18, 2020 · f25e4b4 · f25e4b4
1 parent f9cecc2
commit f25e4b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/make/photon/prepare/Dockerfile b/make/photon/prepare/Dockerfile
@@ -8,11 +8,12 @@ RUN mkdir -p /harbor_make
 
 RUN tdnf install -y python3 \
     && tdnf install -y python3-pip
+RUN pip3 install --upgrade setuptools
 RUN pip3 install pipenv==2018.11.26
 
 COPY make/photon/prepare /usr/src/app
 RUN set -ex && pipenv install --deploy --system
 
 ENTRYPOINT [ "python3", "main.py" ]
 
-VOLUME ["/harbor_make"]
+VOLUME ["/harbor_make"]
diff --git a/make/prepare b/make/prepare
@@ -51,7 +51,7 @@ docker run --rm -v $input_dir:/input:z \
                     -v $config_dir:/config:z \
                     -v $secret_dir:/secret:z \
                     -v /:/hostfs:z \
-                    goharbor/prepare:dev $@
+                    goharbor/prepare:v1.9.3 $@
 
 echo "Clean up the input dir"
 # Clean up input dir