github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99022 from vinayakankugoyal/dockerfile2

Browse Source 
Use ARG instead of sed in the conformance image.
This commit is contained in:
Kubernetes Prow Robot 2021-02-12 15:35:04 -08:00 committed by GitHub
commit f24b87ec8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/images/conformance/Dockerfile
View File

@ -12,7 +12,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM BASEIMAGE ARG BASEIMAGE
FROM ${BASEIMAGE}
COPY ginkgo /usr/local/bin/ COPY ginkgo /usr/local/bin/
COPY e2e.test /usr/local/bin/ COPY e2e.test /usr/local/bin/

3
cluster/images/conformance/Makefile
View File

@ -54,13 +54,12 @@ endif
chmod a+rx ${TEMP_DIR}/e2e.test chmod a+rx ${TEMP_DIR}/e2e.test
chmod a+rx ${TEMP_DIR}/gorunner chmod a+rx ${TEMP_DIR}/gorunner
cd ${TEMP_DIR} && sed -i.back "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile
DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build \ DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build \
--platform linux/${ARCH} \ --platform linux/${ARCH} \
--load \ --load \
--pull \ --pull \
-t ${REGISTRY}/conformance-${ARCH}:${VERSION} \ -t ${REGISTRY}/conformance-${ARCH}:${VERSION} \
--build-arg BASEIMAGE=$(BASEIMAGE) \
${TEMP_DIR} ${TEMP_DIR}
rm -rf "${TEMP_DIR}" rm -rf "${TEMP_DIR}"