diff options
| author | Max Resnick <max@ofmax.li> | 2022-03-08 22:05:05 -0800 |
|---|---|---|
| committer | Max Resnick <max@ofmax.li> | 2022-03-08 22:05:05 -0800 |
| commit | 04b1c2b4aa0530dd9bdbf849c4ea33644b719c1d (patch) | |
| tree | 40e17dde2697870f7fcfd9e40e65dfda27e04b0c /src | |
| parent | ccac53c08e88393decc20aa79d54abce2c304d57 (diff) | |
| download | grumpy-containers-04b1c2b4aa0530dd9bdbf849c4ea33644b719c1d.tar.gz | |
fixup some stuff
Diffstat (limited to '')
| -rw-r--r-- | src/cluster/Dockerfile | 20 | ||||
| -rwxr-xr-x | src/cluster/entrypoint.sh | 2 | ||||
| -rw-r--r-- | src/go-echo/Dockerfile | 12 |
3 files changed, 23 insertions, 11 deletions
diff --git a/src/cluster/Dockerfile b/src/cluster/Dockerfile index 3350e38..622d5b7 100644 --- a/src/cluster/Dockerfile +++ b/src/cluster/Dockerfile @@ -1,20 +1,20 @@ +ARG BASE_VER=latest FROM gcr.io/google-containers/pause:latest -FROM gcr.io/google_containers/echoserver:1.0 -FROM registry.gitlab.com/grumps/grumpy-containers/base:${BASE_VER} -ENV DEBIAN_FRONTEND=noninteractive - -RUN useradd -s /usr/sbin/nologin \ - --create-home \ - --home-dir /opt/app \ - app +FROM golang:1.17-bullseye +WORKDIR /app +RUN git clone https://git.ofmax.li/go-echo \ + && cd go-echo \ + && go build -o /go-echo + +FROM registry.gitlab.com/grumps/grumpy-containers/base:${BASE_VER} +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -y \ && apt-get upgrade -y \ && apt-get install -y curl dnsutils jq vim kubernetes-client tmux ldap-utils ncat nmap hping3 python3-minimal unattended-upgrades \ && unattended-upgrades - COPY --from=0 /pause /usr/local/bin/pause -COPY --from=1 echoserver.py /usr/local/bin/echoserver +COPY --from=1 /app/go-echo /usr/local/bin/go-echo COPY entrypoint.sh /usr/local/bin/entrypoint.sh USER app diff --git a/src/cluster/entrypoint.sh b/src/cluster/entrypoint.sh index f8c72f8..31112c0 100755 --- a/src/cluster/entrypoint.sh +++ b/src/cluster/entrypoint.sh @@ -5,6 +5,6 @@ case "${cmd}" in "pause") exec pause;; "echoserver") - exec python3 /usr/local/bin/echoserver;; + exec go-echo;; *) echo >&2 "Invalid option: $@"; exit 1;; esac diff --git a/src/go-echo/Dockerfile b/src/go-echo/Dockerfile new file mode 100644 index 0000000..2c8a082 --- /dev/null +++ b/src/go-echo/Dockerfile @@ -0,0 +1,12 @@ +ARG BASE_VER=latest +FROM golang:1.17-bullseye + +WORKDIR /app + +RUN git clone https://git.ofmax.li/go-echo \ + && cd go-echo \ + && go build -o /go-echo + +FROM registry.gitlab.com/grumps/grumpy-containers/base:${BASE_VER} +COPY --from=0 /app/go-echo /opt/app/go-echo +CMD [ "/opt/app/go-echo" ] |