aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/base/Dockerfile19
-rw-r--r--src/base/VERSION2
-rw-r--r--src/base/targets/buster-builder0
-rw-r--r--src/base/targets/buster-slim0
-rw-r--r--src/base/targets/sid-slim0
-rw-r--r--src/git-snapshot/Dockerfile2
-rw-r--r--src/gitolite/Dockerfile2
-rw-r--r--src/helm-tools/Dockerfile2
-rw-r--r--src/pelican/Dockerfile2
-rw-r--r--src/znc/Dockerfile2
10 files changed, 23 insertions, 8 deletions
diff --git a/src/base/Dockerfile b/src/base/Dockerfile
index 30366a7..5a5b365 100644
--- a/src/base/Dockerfile
+++ b/src/base/Dockerfile
@@ -1,5 +1,4 @@
-ARG VERSION=buster-slim
-FROM debian:${VERSION}
+FROM debian:buster-slim as buster-slim
ENV DEBIAN_FRONTEND=noninteractive
RUN useradd -s /usr/sbin/nologin \
--create-home \
@@ -7,3 +6,19 @@ RUN useradd -s /usr/sbin/nologin \
app
COPY bin/install_deb /usr/local/bin/install_deb
WORKDIR /opt/app
+FROM debian:sid-slim as sid-slim
+ENV DEBIAN_FRONTEND=noninteractive
+RUN useradd -s /usr/sbin/nologin \
+ --create-home \
+ --home-dir /opt/app \
+ app
+COPY bin/install_deb /usr/local/bin/install_deb
+WORKDIR /opt/app
+FROM buster-slim as buster-builder
+ENV DEBIAN_FRONTEND=noninteractive
+COPY bin/install_deb /usr/local/bin/install_deb
+RUN install_deb curl
+WORKDIR /opt/app
+FROM debian:buster-slim as finale
+ENV DEBIAN_FRONTEND=noninteractive
+COPY bin/install_deb /usr/local/bin/install_deb
diff --git a/src/base/VERSION b/src/base/VERSION
index a3dce6c..f9cece5 100644
--- a/src/base/VERSION
+++ b/src/base/VERSION
@@ -1 +1 @@
-v0.0.2
+v0.0.3
diff --git a/src/base/targets/buster-builder b/src/base/targets/buster-builder
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/base/targets/buster-builder
diff --git a/src/base/targets/buster-slim b/src/base/targets/buster-slim
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/base/targets/buster-slim
diff --git a/src/base/targets/sid-slim b/src/base/targets/sid-slim
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/base/targets/sid-slim
diff --git a/src/git-snapshot/Dockerfile b/src/git-snapshot/Dockerfile
index 3c78a99..87e08a6 100644
--- a/src/git-snapshot/Dockerfile
+++ b/src/git-snapshot/Dockerfile
@@ -1,5 +1,5 @@
ARG GIT_SNAPSHOT=0.0.1
-FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.2
+FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.3
ARG GIT_SNAPSHOT
SHELL ["/bin/bash", "-c"]
RUN install_deb python3-minimal python3-pip python3-setuptools python3-wheel git \
diff --git a/src/gitolite/Dockerfile b/src/gitolite/Dockerfile
index 0127e22..e08e76b 100644
--- a/src/gitolite/Dockerfile
+++ b/src/gitolite/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.2
+FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.3
SHELL ["/bin/bash", "-c"]
RUN install_deb gitolite3
diff --git a/src/helm-tools/Dockerfile b/src/helm-tools/Dockerfile
index 348cd6a..d3aba41 100644
--- a/src/helm-tools/Dockerfile
+++ b/src/helm-tools/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.1
+FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.3
RUN apt-get update -y \
&& apt-get install -y curl make git \
&& curl -L -o /tmp/hm.tar.gz https://get.helm.sh/helm-v2.14.3-linux-amd64.tar.gz \
diff --git a/src/pelican/Dockerfile b/src/pelican/Dockerfile
index 8a902f4..3834138 100644
--- a/src/pelican/Dockerfile
+++ b/src/pelican/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.1
+FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.3
RUN apt-get update -y && apt-get install -y python3-pip libsass-dev ruby-sass
RUN pip3 install pelican webassets Pillow markdown cssmin libsass
USER app
diff --git a/src/znc/Dockerfile b/src/znc/Dockerfile
index c819b60..241761c 100644
--- a/src/znc/Dockerfile
+++ b/src/znc/Dockerfile
@@ -1,5 +1,5 @@
FROM gcr.io/google-containers/pause:latest
-FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.2-sid-slim
+FROM registry.gitlab.com/grumps/grumpy-containers/base:v0.0.3-sid-slim
SHELL ["/bin/bash", "-c"]
RUN install_deb znc znc-perl znc-push znc-python znc-backlog
USER app