Browse code
Dockerfile: remove "INSTALL_BINARY_NAME" envs
Using a variable here doesn't seem to add much, so inlining
the value instead.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2020/01/15 23:22:41Showing 1 changed files
| ... | ... |
@@ -144,22 +144,20 @@ RUN --mount=type=cache,sharing=locked,id=moby-cross-true-aptlib,target=/var/lib/ |
| 144 | 144 |
FROM runtime-dev-cross-${CROSS} AS runtime-dev
|
| 145 | 145 |
|
| 146 | 146 |
FROM base AS tomlv |
| 147 |
-ENV INSTALL_BINARY_NAME=tomlv |
|
| 148 | 147 |
ARG TOMLV_COMMIT |
| 149 | 148 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 150 |
-COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
|
| 149 |
+COPY hack/dockerfile/install/tomlv.installer ./ |
|
| 151 | 150 |
RUN --mount=type=cache,target=/root/.cache/go-build \ |
| 152 | 151 |
--mount=type=cache,target=/go/pkg/mod \ |
| 153 |
- PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 152 |
+ PREFIX=/build ./install.sh tomlv |
|
| 154 | 153 |
|
| 155 | 154 |
FROM base AS vndr |
| 156 |
-ENV INSTALL_BINARY_NAME=vndr |
|
| 157 | 155 |
ARG VNDR_COMMIT |
| 158 | 156 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 159 |
-COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
|
| 157 |
+COPY hack/dockerfile/install/vndr.installer ./ |
|
| 160 | 158 |
RUN --mount=type=cache,target=/root/.cache/go-build \ |
| 161 | 159 |
--mount=type=cache,target=/go/pkg/mod \ |
| 162 |
- PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 160 |
+ PREFIX=/build ./install.sh vndr |
|
| 163 | 161 |
|
| 164 | 162 |
FROM dev-base AS containerd |
| 165 | 163 |
ARG DEBIAN_FRONTEND |
| ... | ... |
@@ -168,68 +166,61 @@ RUN --mount=type=cache,sharing=locked,id=moby-containerd-aptlib,target=/var/lib/ |
| 168 | 168 |
--mount=type=cache,sharing=locked,id=moby-containerd-aptcache,target=/var/cache/apt \ |
| 169 | 169 |
apt-get update && apt-get install -y --no-install-recommends \ |
| 170 | 170 |
libbtrfs-dev |
| 171 |
-ENV INSTALL_BINARY_NAME=containerd |
|
| 172 | 171 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 173 |
-COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
|
| 172 |
+COPY hack/dockerfile/install/containerd.installer ./ |
|
| 174 | 173 |
RUN --mount=type=cache,target=/root/.cache/go-build \ |
| 175 | 174 |
--mount=type=cache,target=/go/pkg/mod \ |
| 176 |
- PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 175 |
+ PREFIX=/build ./install.sh containerd |
|
| 177 | 176 |
|
| 178 | 177 |
FROM dev-base AS proxy |
| 179 |
-ENV INSTALL_BINARY_NAME=proxy |
|
| 180 | 178 |
ARG LIBNETWORK_COMMIT |
| 181 | 179 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 182 |
-COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
|
| 180 |
+COPY hack/dockerfile/install/proxy.installer ./ |
|
| 183 | 181 |
RUN --mount=type=cache,target=/root/.cache/go-build \ |
| 184 | 182 |
--mount=type=cache,target=/go/pkg/mod \ |
| 185 |
- PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 183 |
+ PREFIX=/build ./install.sh proxy |
|
| 186 | 184 |
|
| 187 | 185 |
FROM base AS golangci_lint |
| 188 |
-ENV INSTALL_BINARY_NAME=golangci_lint |
|
| 189 | 186 |
ARG GOLANGCI_LINT_COMMIT |
| 190 | 187 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 191 |
-COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
|
| 188 |
+COPY hack/dockerfile/install/golangci_lint.installer ./ |
|
| 192 | 189 |
RUN --mount=type=cache,target=/root/.cache/go-build \ |
| 193 | 190 |
--mount=type=cache,target=/go/pkg/mod \ |
| 194 |
- PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 191 |
+ PREFIX=/build ./install.sh golangci_lint |
|
| 195 | 192 |
|
| 196 | 193 |
FROM base AS gotestsum |
| 197 |
-ENV INSTALL_BINARY_NAME=gotestsum |
|
| 198 | 194 |
ARG GOTESTSUM_COMMIT |
| 199 | 195 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 200 |
-COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
|
| 196 |
+COPY hack/dockerfile/install/gotestsum.installer ./ |
|
| 201 | 197 |
RUN --mount=type=cache,target=/root/.cache/go-build \ |
| 202 | 198 |
--mount=type=cache,target=/go/pkg/mod \ |
| 203 |
- PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 199 |
+ PREFIX=/build ./install.sh gotestsum |
|
| 204 | 200 |
|
| 205 | 201 |
FROM base AS shfmt |
| 206 |
-ENV INSTALL_BINARY_NAME=shfmt |
|
| 207 | 202 |
ARG SHFMT_COMMIT |
| 208 | 203 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 209 |
-COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
|
| 204 |
+COPY hack/dockerfile/install/shfmt.installer ./ |
|
| 210 | 205 |
RUN --mount=type=cache,target=/root/.cache/go-build \ |
| 211 | 206 |
--mount=type=cache,target=/go/pkg/mod \ |
| 212 |
- PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 207 |
+ PREFIX=/build ./install.sh shfmt |
|
| 213 | 208 |
|
| 214 | 209 |
FROM dev-base AS dockercli |
| 215 |
-ENV INSTALL_BINARY_NAME=dockercli |
|
| 216 | 210 |
ARG DOCKERCLI_CHANNEL |
| 217 | 211 |
ARG DOCKERCLI_VERSION |
| 218 | 212 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 219 |
-COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
|
| 213 |
+COPY hack/dockerfile/install/dockercli.installer ./ |
|
| 220 | 214 |
RUN --mount=type=cache,target=/root/.cache/go-build \ |
| 221 | 215 |
--mount=type=cache,target=/go/pkg/mod \ |
| 222 |
- PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 216 |
+ PREFIX=/build ./install.sh dockercli |
|
| 223 | 217 |
|
| 224 | 218 |
FROM runtime-dev AS runc |
| 225 |
-ENV INSTALL_BINARY_NAME=runc |
|
| 226 | 219 |
ARG RUNC_COMMIT |
| 227 | 220 |
ARG RUNC_BUILDTAGS |
| 228 | 221 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 229 |
-COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
|
| 222 |
+COPY hack/dockerfile/install/runc.installer ./ |
|
| 230 | 223 |
RUN --mount=type=cache,target=/root/.cache/go-build \ |
| 231 | 224 |
--mount=type=cache,target=/go/pkg/mod \ |
| 232 |
- PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 225 |
+ PREFIX=/build ./install.sh runc |
|
| 233 | 226 |
|
| 234 | 227 |
FROM dev-base AS tini |
| 235 | 228 |
ARG DEBIAN_FRONTEND |
| ... | ... |
@@ -240,20 +231,18 @@ RUN --mount=type=cache,sharing=locked,id=moby-tini-aptlib,target=/var/lib/apt \ |
| 240 | 240 |
cmake \ |
| 241 | 241 |
vim-common |
| 242 | 242 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 243 |
-ENV INSTALL_BINARY_NAME=tini |
|
| 244 |
-COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
|
| 243 |
+COPY hack/dockerfile/install/tini.installer ./ |
|
| 245 | 244 |
RUN --mount=type=cache,target=/root/.cache/go-build \ |
| 246 | 245 |
--mount=type=cache,target=/go/pkg/mod \ |
| 247 |
- PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 246 |
+ PREFIX=/build ./install.sh tini |
|
| 248 | 247 |
|
| 249 | 248 |
FROM dev-base AS rootlesskit |
| 250 |
-ENV INSTALL_BINARY_NAME=rootlesskit |
|
| 251 | 249 |
ARG ROOTLESSKIT_COMMIT |
| 252 | 250 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 253 |
-COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
|
| 251 |
+COPY hack/dockerfile/install/rootlesskit.installer ./ |
|
| 254 | 252 |
RUN --mount=type=cache,target=/root/.cache/go-build \ |
| 255 | 253 |
--mount=type=cache,target=/go/pkg/mod \ |
| 256 |
- PREFIX=/build/ ./install.sh $INSTALL_BINARY_NAME |
|
| 254 |
+ PREFIX=/build/ ./install.sh rootlesskit |
|
| 257 | 255 |
COPY ./contrib/dockerd-rootless.sh /build |
| 258 | 256 |
|
| 259 | 257 |
FROM djs55/vpnkit:${VPNKIT_VERSION} AS vpnkit
|