Skip to content

Commit 7b7c441

Browse files
Hazhzengdivyagandhisethi
authored andcommitted
[Revert] Python 3.8 images (#208)
1 parent 6321c1b commit 7b7c441

File tree

6 files changed

+2
-110
lines changed

6 files changed

+2
-110
lines changed

build/python.sh

+1-31
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,6 @@ function build {
3939
test_image "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.7"
4040
test_image "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.7-appservice"
4141

42-
# build python:$IMAGE_TAG_VERSION.x-python3.8 and python:$IMAGE_TAG_VERSION.x-python3.8-appservice
43-
docker build -t "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.8-deps" -f $DIR/../host/$DOCKERFILE_BASE/amd64/python/python38-deps.Dockerfile $DIR/../host/$DOCKERFILE_BASE/amd64/python
44-
docker build -t "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.8-buildenv" -f $DIR/../host/$DOCKERFILE_BASE/amd64/python/python38-buildenv.Dockerfile --build-arg BASE_PYTHON_IMAGE="${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.8-deps" $DIR/../host/$DOCKERFILE_BASE/amd64/python
45-
docker build -t "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.8" -f $DIR/../host/$DOCKERFILE_BASE/amd64/python/python38.Dockerfile --build-arg BASE_IMAGE="${REGISTRY}base:${IMAGE_TAG_VERSION}" --build-arg BASE_PYTHON_IMAGE="${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.8-deps" $DIR/../host/$DOCKERFILE_BASE/amd64/python
46-
docker build -t "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.8-appservice" -f $DIR/../host/$DOCKERFILE_BASE/amd64/appservice/python38.Dockerfile --build-arg BASE_IMAGE="${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.8" $DIR/../host/$DOCKERFILE_BASE/amd64/appservice
47-
test_image "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.8"
48-
test_image "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.8-appservice"
49-
5042
# tag default python:$IMAGE_TAG_VERSION.x and python:$IMAGE_TAG_VERSION.x-appservice
5143
docker tag "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.6" "${REGISTRY}python:${IMAGE_TAG_VERSION}"
5244
docker tag "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.6-appservice" "${REGISTRY}python:${IMAGE_TAG_VERSION}-appservice"
@@ -59,7 +51,6 @@ function push {
5951
# push build-env images
6052
docker push "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.6-buildenv"
6153
docker push "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.7-buildenv"
62-
docker push "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.8-buildenv"
6354

6455
# push default python:$IMAGE_TAG_VERSION.x and python:$IMAGE_TAG_VERSION.x-appservice images
6556
docker push "${REGISTRY}python:${IMAGE_TAG_VERSION}"
@@ -73,22 +64,16 @@ function push {
7364
# push default python:$IMAGE_TAG_VERSION.x-python3.7 and python:$IMAGE_TAG_VERSION.x-python3.7-appservice images
7465
docker push "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.7"
7566
docker push "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.7-appservice"
76-
77-
# push default python:$IMAGE_TAG_VERSION.x-python3.8 and python:$IMAGE_TAG_VERSION.x-python3.8-appservice images
78-
docker push "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.8"
79-
docker push "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.8-appservice"
8067
}
8168

8269
function purge {
8370
# purge deps image
8471
docker rmi "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.6-deps"
8572
docker rmi "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.7-deps"
86-
docker rmi "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.8-deps"
8773

8874
# purge build-env images
8975
docker rmi "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.6-buildenv"
9076
docker rmi "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.7-buildenv"
91-
docker rmi "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.8-buildenv"
9277

9378
# purge default python:$IMAGE_TAG_VERSION.x and python:$IMAGE_TAG_VERSION.x-appservice images
9479
docker rmi "${REGISTRY}python:${IMAGE_TAG_VERSION}"
@@ -102,23 +87,16 @@ function purge {
10287
# purge default python:$IMAGE_TAG_VERSION.x-python3.7 and python:$IMAGE_TAG_VERSION.x-python3.7-appservice images
10388
docker rmi "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.7"
10489
docker rmi "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.7-appservice"
105-
106-
# purge default python:$IMAGE_TAG_VERSION.x-python3.8 and python:$IMAGE_TAG_VERSION.x-python3.8-appservice images
107-
docker rmi "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.8"
108-
docker rmi "${REGISTRY}python:${IMAGE_TAG_VERSION}-python3.8-appservice"
10990
}
11091

11192
function tag_push {
11293
# tag & push build-env images
11394
docker pull "${REGISTRY}python:${RELEASE_VERSION}-python3.6-buildenv"
11495
docker pull "${REGISTRY}python:${RELEASE_VERSION}-python3.7-buildenv"
115-
docker pull "${REGISTRY}python:${RELEASE_VERSION}-python3.8-buildenv"
11696
docker tag "${REGISTRY}python:${RELEASE_VERSION}-python3.6-buildenv" "${REGISTRY}python:$MAJOR_VERSION-python3.6-buildenv"
11797
docker tag "${REGISTRY}python:${RELEASE_VERSION}-python3.7-buildenv" "${REGISTRY}python:$MAJOR_VERSION-python3.7-buildenv"
118-
docker tag "${REGISTRY}python:${RELEASE_VERSION}-python3.8-buildenv" "${REGISTRY}python:$MAJOR_VERSION-python3.8-buildenv"
11998
docker push "${REGISTRY}python:$MAJOR_VERSION-python3.6-buildenv"
12099
docker push "${REGISTRY}python:$MAJOR_VERSION-python3.7-buildenv"
121-
docker push "${REGISTRY}python:$MAJOR_VERSION-python3.8-buildenv"
122100

123101
# tag & push default python:$MAJOR_VERSION and python:$MAJOR_VERSION-appservice images
124102
docker pull "${REGISTRY}python:${RELEASE_VERSION}"
@@ -146,14 +124,6 @@ function tag_push {
146124
docker tag "${REGISTRY}python:${RELEASE_VERSION}-python3.7-appservice" "${REGISTRY}python:$MAJOR_VERSION-python3.7-appservice"
147125
docker push "${REGISTRY}python:$MAJOR_VERSION-python3.7"
148126
docker push "${REGISTRY}python:$MAJOR_VERSION-python3.7-appservice"
149-
150-
# tag & push default python:$MAJOR_VERSION-python3.8 and python:$MAJOR_VERSION-python3.8-appservice images
151-
docker pull "${REGISTRY}python:${RELEASE_VERSION}-python3.8"
152-
docker pull "${REGISTRY}python:${RELEASE_VERSION}-python3.8-appservice"
153-
docker tag "${REGISTRY}python:${RELEASE_VERSION}-python3.8" "${REGISTRY}python:$MAJOR_VERSION-python3.8"
154-
docker tag "${REGISTRY}python:${RELEASE_VERSION}-python3.8-appservice" "${REGISTRY}python:$MAJOR_VERSION-python3.8-appservice"
155-
docker push "${REGISTRY}python:$MAJOR_VERSION-python3.8"
156-
docker push "${REGISTRY}python:$MAJOR_VERSION-python3.8-appservice"
157127
}
158128

159129
if [ "$1" == "build" ]; then
@@ -194,4 +164,4 @@ else
194164
echo -e "\t$0 tag_push"
195165
echo -e "\tTags \$RELEASE_VERSION images with \$MAJOR_VERSION and pushes them"
196166
echo ""
197-
fi
167+
fi

host/3.0/buster/amd64/appservice/python38.Dockerfile

-16
This file was deleted.

host/3.0/buster/amd64/python/python38-buildenv.Dockerfile

-9
This file was deleted.

host/3.0/buster/amd64/python/python38-deps.Dockerfile

-40
This file was deleted.

host/3.0/buster/amd64/python/python38.Dockerfile

-13
This file was deleted.

kudulite/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/oryx/build:20191216.3 as main
1+
FROM mcr.microsoft.com/oryx/build:20191018.1 as main
22
ARG BRANCH
33
ARG NAMESPACE
44
ENV DEBIAN_FRONTEND noninteractive

0 commit comments

Comments
 (0)