This commit is contained in:
aynic.os
2021-06-16 12:19:52 +01:00
parent f0c10a3082
commit ce449b3966
80 changed files with 828 additions and 448 deletions
+2 -2
View File
@@ -43,7 +43,7 @@ ARG SHELL=/bin/bash
ARG SSH_BASTION_HOSTNAME
ARG SSH_BASTION_USERNAME
ARG SSH_PRIVATE_IP_RANGE
ARG SSH_PUBLIC_HOST_KEYS
ARG SSH_PUBLIC_HOSTS
ARG UID
ARG USER
ENV UID=${UID}
@@ -110,7 +110,7 @@ WORKDIR /home/$USER
# git config
RUN mkdir -p ~/.ssh ~/.config/git \
&& ssh-keyscan -t rsa -H ${SSH_PUBLIC_HOST_KEYS} >> ~/.ssh/known_hosts \
&& ssh-keyscan -t rsa -H ${SSH_PUBLIC_HOSTS} >> ~/.ssh/known_hosts \
&& echo -e "\
.DS_Store\n\
.idea/\n\
+11 -10
View File
@@ -14,16 +14,17 @@ WORKDIR /go/src/github.com/gliderlabs/registrator/
RUN \
apk add --no-cache curl git \
&& git clone https://github.com/gliderlabs/registrator/ . \
&& git reset --hard da90d170da9dd7e1a8d9a13429d44686dc3d118f \
# -useIpFromNetwork command line option \
&& git fetch origin pull/596/head \
&& git merge --no-edit 8d904c60949e310893a25c8af3636b0151334dd4 \
# convert check.Script to check.Args \
&& git fetch origin pull/627/head \
&& git merge --no-edit ed053c364e3ba941aeca9ab0d8791b051ff4dede \
# skip tls verification \
&& git fetch origin pull/661/head \
&& git merge --no-edit 38fc83ac07b4a070be71079cb810429d94a60205 \
# TEMPORARY DISABLED - TODO: check with new upstream master
# && git reset --hard da90d170da9dd7e1a8d9a13429d44686dc3d118f \
# # -useIpFromNetwork command line option \
# && git fetch origin pull/596/head \
# && git merge --no-edit 8d904c60949e310893a25c8af3636b0151334dd4 \
# # convert check.Script to check.Args \
# && git fetch origin pull/627/head \
# && git merge --no-edit ed053c364e3ba941aeca9ab0d8791b051ff4dede \
# # skip tls verification \
# && git fetch origin pull/661/head \
# && git merge --no-edit 38fc83ac07b4a070be71079cb810429d94a60205 \
&& curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh \
&& dep ensure -vendor-only \
&& CGO_ENABLED=0 GOOS=linux go build \
+2 -2
View File
@@ -166,7 +166,7 @@ ARG UID
ARG GID
ARG SSH_BASTION_HOSTNAME
ARG SSH_BASTION_USERNAME
ARG SSH_PUBLIC_HOST_KEYS
ARG SSH_PUBLIC_HOSTS
ARG SSH_PRIVATE_IP_RANGE
ARG USER
ENV UID=${UID}
@@ -237,7 +237,7 @@ RUN yarn --cache-folder ./ycache && rm -rf ./ycache \
# git config
RUN mkdir -p ~/.ssh ~/.config/git \
&& ssh-keyscan -t rsa -H ${SSH_PUBLIC_HOST_KEYS} >> ~/.ssh/known_hosts \
&& ssh-keyscan -t rsa -H ${SSH_PUBLIC_HOSTS} >> ~/.ssh/known_hosts \
&& echo -e "\
.DS_Store\n\
.idea/\n\