Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore upgrade base images #12

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Chore upgrade base images #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b828fa
chore: update base alpine image version to 3.13
carrascomj Jul 21, 2021
00ed366
chore: install git in alpine-compiler image
carrascomj Jul 21, 2021
f3d0a2a
chore: update docker pull in Makefile to alpine3.13
carrascomj Jul 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ DEBIAN_TAG := debian_${BUILD_DATE}_${SHORT_COMMIT}

## Build the Alpine Linux base image.
build-alpine:
docker pull python:3.6-alpine3.10
docker pull python:3.6-alpine3.13
docker build \
--build-arg BUILD_COMMIT=$(BUILD_COMMIT) \
--tag $(IMAGE):alpine \
Expand Down
2 changes: 1 addition & 1 deletion alpine-compiler/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ LABEL dk.dtu.biosustain.wsgi-base.alpine-compiler.build.commit="${BUILD_COMMIT}"
RUN set -eux \
# Install build tools. These can be required for the `pip-compile` step in
# child images that require to build packages from source.
&& apk add --no-cache build-base libffi-dev \
&& apk add --no-cache build-base libffi-dev git \
# Re-run pip-compile in order to pre-populate the pip cache.
&& pip-compile --allow-unsafe --generate-hashes --verbose \
--output-file /dev/null /opt/base-requirements.txt \
Expand Down
2 changes: 1 addition & 1 deletion alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM python:3.6-alpine3.10
FROM python:3.6-alpine3.13

ARG BUILD_COMMIT

Expand Down