comby-tools/comby
1
1
Fork 0
mirror of https://github.com/comby-tools/comby.git synced 2024-10-04 00:34:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

bump Dockerfiles to use alpine 3.14

Browse Source
This commit is contained in:
Rijnard van Tonder 2021-11-13 19:43:17 -08:00
parent 08fc85ca8f
commit f389cfde7a
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,7 +1,7 @@
##########################################################################################################################
### Binary build for testing. Pulled from registry. The base-dependencies-alpine spec builds this. Used by .travis.yml ###
##########################################################################################################################
FROM comby/base-dependencies-alpine-3.12:latest
FROM comby/base-dependencies-alpine-3.14:latest
WORKDIR /home/comby

4
dockerfiles/alpine/base-dependencies/Dockerfile
View File

@ -1,7 +1,7 @@
#########################
### Base Dependencies ###
#########################
FROM ocaml/opam2:alpine-3.12-ocaml-4.11
FROM ocaml/opam:alpine-3.14-ocaml-4.11
WORKDIR /home/comby
@ -33,6 +33,6 @@ COPY push-coverage-report.sh /home/comby/
RUN sudo chown -R $(whoami) /home/comby
# Build and install the OCaml dependencies.
RUN eval $(opam env) && opam repository set-url default https://opam.ocaml.org && opam update && opam install . --deps-only --with-test -y
RUN eval $(opam env) && opam repository set-url default https://opam.ocaml.org && opam update && opam install . --deps-only --with-test -y --no-checksums
# Delete the source files
RUN sudo rm -rf /home/comby

4
dockerfiles/alpine/binary-release-plus-rg/Dockerfile
View File

@ -1,7 +1,7 @@
#######################################
### Source build for alpine release ###
#######################################
FROM comby/base-dependencies-alpine-3.12:latest AS source-build-alpine
FROM comby/base-dependencies-alpine-3.14:latest AS source-build-alpine
WORKDIR /home/comby
@ -28,7 +28,7 @@ RUN opam exec -- dune build --profile release
###########################################################
### Binary distribution on minimal alpine image with rg ###
###########################################################
FROM alpine:3.12
FROM alpine:3.14
LABEL maintainer="Rijnard van Tonder <rvantonder@gmail.com>"
LABEL name="comby"

4
dockerfiles/alpine/binary-release/Dockerfile
View File

@ -1,7 +1,7 @@
#######################################
### Source build for alpine release ###
#######################################
FROM comby/base-dependencies-alpine-3.12:latest AS source-build-alpine
FROM comby/base-dependencies-alpine-3.14:latest AS source-build-alpine
WORKDIR /home/comby
@ -28,7 +28,7 @@ RUN opam exec -- dune build --profile release
###################################################
### Binary distribution on minimal alpine image ###
###################################################
FROM alpine:3.12
FROM alpine:3.14
LABEL maintainer="Rijnard van Tonder <rvantonder@gmail.com>"
LABEL name="comby"

4
dockerfiles/ubuntu/binary-release/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ocaml/opam2:ubuntu-18.04-opam
FROM ocaml/opam:ubuntu-18.04-opam
WORKDIR /home/comby
@ -13,7 +13,7 @@ RUN sudo apt-get update && sudo apt-get install -y \
libsqlite3-dev
RUN opam init --no-setup --disable-sandboxing --compiler=4.11.0
RUN eval $(opam env) && opam repository set-url default https://opam.ocaml.org && opam update
RUN opam switch create 4.11.0 && eval $(opam config env) && opam repository set-url default https://opam.ocaml.org && opam update
COPY Makefile /home/comby/
COPY comby.opam /home/comby/

4
scripts/build-base-dependencies-alpine-image.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
cd ..
docker build --no-cache --tag comby/base-dependencies-alpine-3.12 -f dockerfiles/alpine/base-dependencies/Dockerfile .
docker build --no-cache --tag comby/base-dependencies-alpine-3.14 -f dockerfiles/alpine/base-dependencies/Dockerfile .
echo "If it succeeds, go and push the image:"
echo "docker push comby/base-dependencies-alpine-3.12:latest"
echo "docker push comby/base-dependencies-alpine-3.14:latest"
echo "Now run ./build-docker-binary-releases.sh to make sure the base dependencies image is updated."