Browse code
Fix double slash after $PREFIX
I noticed this in the build output;
```
16:05:07 [100%] Built target tini-static
16:05:07 + mkdir -p /build/
16:05:07 + cp tini-static /build//docker-init
```
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2018/12/25 01:42:24Showing 1 changed files
| ... | ... |
@@ -115,51 +115,51 @@ FROM base AS tomlv |
| 115 | 115 |
ENV INSTALL_BINARY_NAME=tomlv |
| 116 | 116 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 117 | 117 |
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
| 118 |
-RUN PREFIX=/build/ ./install.sh $INSTALL_BINARY_NAME |
|
| 118 |
+RUN PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 119 | 119 |
|
| 120 | 120 |
FROM base AS vndr |
| 121 | 121 |
ENV INSTALL_BINARY_NAME=vndr |
| 122 | 122 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 123 | 123 |
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
| 124 |
-RUN PREFIX=/build/ ./install.sh $INSTALL_BINARY_NAME |
|
| 124 |
+RUN PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 125 | 125 |
|
| 126 | 126 |
FROM base AS containerd |
| 127 | 127 |
RUN apt-get update && apt-get install -y btrfs-tools |
| 128 | 128 |
ENV INSTALL_BINARY_NAME=containerd |
| 129 | 129 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 130 | 130 |
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
| 131 |
-RUN PREFIX=/build/ ./install.sh $INSTALL_BINARY_NAME |
|
| 131 |
+RUN PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 132 | 132 |
|
| 133 | 133 |
FROM base AS proxy |
| 134 | 134 |
ENV INSTALL_BINARY_NAME=proxy |
| 135 | 135 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 136 | 136 |
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
| 137 |
-RUN PREFIX=/build/ ./install.sh $INSTALL_BINARY_NAME |
|
| 137 |
+RUN PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 138 | 138 |
|
| 139 | 139 |
FROM base AS gometalinter |
| 140 | 140 |
ENV INSTALL_BINARY_NAME=gometalinter |
| 141 | 141 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 142 | 142 |
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
| 143 |
-RUN PREFIX=/build/ ./install.sh $INSTALL_BINARY_NAME |
|
| 143 |
+RUN PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 144 | 144 |
|
| 145 | 145 |
FROM base AS dockercli |
| 146 | 146 |
ENV INSTALL_BINARY_NAME=dockercli |
| 147 | 147 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 148 | 148 |
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
| 149 |
-RUN PREFIX=/build/ ./install.sh $INSTALL_BINARY_NAME |
|
| 149 |
+RUN PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 150 | 150 |
|
| 151 | 151 |
FROM runtime-dev AS runc |
| 152 | 152 |
ENV INSTALL_BINARY_NAME=runc |
| 153 | 153 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 154 | 154 |
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
| 155 |
-RUN PREFIX=/build/ ./install.sh $INSTALL_BINARY_NAME |
|
| 155 |
+RUN PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 156 | 156 |
|
| 157 | 157 |
FROM base AS tini |
| 158 | 158 |
RUN apt-get update && apt-get install -y cmake vim-common |
| 159 | 159 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 160 | 160 |
ENV INSTALL_BINARY_NAME=tini |
| 161 | 161 |
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
| 162 |
-RUN PREFIX=/build/ ./install.sh $INSTALL_BINARY_NAME |
|
| 162 |
+RUN PREFIX=/build ./install.sh $INSTALL_BINARY_NAME |
|
| 163 | 163 |
|
| 164 | 164 |
|
| 165 | 165 |
|