diff options
| author | Patrick Spek <p.spek@tyil.nl> | 2020-04-08 14:16:48 +0200 |
|---|---|---|
| committer | Patrick Spek <p.spek@tyil.nl> | 2020-04-08 14:16:48 +0200 |
| commit | 6a336f0167393318639b6bc1c9ccf0484219c970 (patch) | |
| tree | 216ec664235bb02adc56beebab1e5fc7daec7a74 /lib/docker | |
| parent | 2b8fac1454b3ca9077621420cedda3c228a87466 (diff) | |
Rewrite the build-docker action
Diffstat (limited to 'lib/docker')
| -rw-r--r-- | lib/docker/alpine.Dockerfile (renamed from lib/docker/alpine) | 12 | ||||
| -rw-r--r-- | lib/docker/archlinux.Dockerfile (renamed from lib/docker/archlinux) | 12 | ||||
| -rw-r--r-- | lib/docker/centos.Dockerfile (renamed from lib/docker/centos) | 11 | ||||
| -rw-r--r-- | lib/docker/debian.Dockerfile (renamed from lib/docker/debian) | 14 |
4 files changed, 18 insertions, 31 deletions
diff --git a/lib/docker/alpine b/lib/docker/alpine.Dockerfile index e4770c8..2170c0e 100644 --- a/lib/docker/alpine +++ b/lib/docker/alpine.Dockerfile @@ -1,16 +1,12 @@ -FROM alpine:{{TAG}} AS base - -RUN apk add --no-cache \ - bash build-base git perl readline +FROM alpine:latest AS base COPY . /home/rstar -RUN /home/rstar/bin/rstar install \ - -p /home/raku {{INSTALL_OPTIONS}} - +RUN apk add --no-cache bash build-base git perl readline +RUN /home/rstar/bin/rstar install -p /home/raku RUN apk del bash build-base git perl -FROM alpine:{{TAG}} +FROM alpine:latest COPY --from=base /home/raku /usr/local COPY --from=base /usr/lib /usr/lib diff --git a/lib/docker/archlinux b/lib/docker/archlinux.Dockerfile index 637ba3c..24663dd 100644 --- a/lib/docker/archlinux +++ b/lib/docker/archlinux.Dockerfile @@ -1,15 +1,13 @@ -FROM archlinux:{{TAG}} AS base - -RUN pacman -Sy && pacman --noconfirm -S gcc make +FROM archlinux:latest AS base COPY . /home/rstar -RUN /home/rstar/bin/rstar install \ - -p /home/raku {{INSTALL_OPTIONS}} - +RUN pacman -Sy +RUN pacman --noconfirm -S gcc make +RUN /home/rstar/bin/rstar install -p /home/raku RUN pacman --noconfirm -Rs gcc make -FROM archlinux:{{TAG}} +FROM archlinux:latest COPY --from=base /home/raku /usr/local COPY --from=base /usr/lib /usr/lib diff --git a/lib/docker/centos b/lib/docker/centos.Dockerfile index 7c6b8d4..bebe219 100644 --- a/lib/docker/centos +++ b/lib/docker/centos.Dockerfile @@ -1,15 +1,12 @@ -FROM centos:{{TAG}} AS base - -RUN yum -y install perl git gcc make +FROM centos:latest AS base COPY . /home/rstar -RUN /home/rstar/bin/rstar install \ - -p /home/raku {{INSTALL_OPTIONS}} - +RUN yum -y install perl git gcc make +RUN /home/rstar/bin/rstar install -p /home/raku RUN yum -y remove perl git gcc make -FROM centos:{{TAG}} +FROM centos:latest COPY --from=base /home/raku /usr/local COPY --from=base /usr/lib64 /usr/lib64 diff --git a/lib/docker/debian b/lib/docker/debian.Dockerfile index 2051a27..52652a4 100644 --- a/lib/docker/debian +++ b/lib/docker/debian.Dockerfile @@ -1,18 +1,14 @@ -FROM debian:{{TAG}} AS base - -RUN apt-get update -RUN apt-get install -y \ - git build-essential libreadline7 +FROM debian:latest AS base COPY . /home/rstar -RUN /home/rstar/bin/rstar install \ - -p /home/raku {{INSTALL_OPTIONS}} - +RUN apt-get update +RUN apt-get install -y git build-essential libreadline7 +RUN /home/rstar/bin/rstar install -p /home/raku RUN apt-get -y remove git build-essential RUN apt-get -y autoremove -FROM debian:{{TAG}} +FROM debian:latest COPY --from=base /home/raku /usr/local COPY --from=base /lib /lib |