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

Specify BASEIMAGE platform for conformance image

Browse Source 
Updates conformance image Dockerfile to specify platform for BASEIMAGE
and sets correct ARCH in Makefile.

Signed-off-by: hasheddan <georgedanielmangum@gmail.com>
This commit is contained in:
hasheddan 2021-01-13 08:46:01 -06:00
parent e414d4e5c2
commit bc262d6e85
No known key found for this signature in database
GPG Key ID: BD68BC686A14C271
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/images/conformance/Dockerfile
View File

@ -12,7 +12,7 @@
# 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 FROM --platform=linux/ARCH BASEIMAGE
COPY ginkgo /usr/local/bin/ COPY ginkgo /usr/local/bin/
COPY e2e.test /usr/local/bin/ COPY e2e.test /usr/local/bin/

2
cluster/images/conformance/Makefile
View File

@ -54,7 +54,7 @@ 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 cd ${TEMP_DIR} && sed -i.back "s|ARCH|${ARCH}|g; s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile
docker build --pull -t ${REGISTRY}/conformance-${ARCH}:${VERSION} ${TEMP_DIR} docker build --pull -t ${REGISTRY}/conformance-${ARCH}:${VERSION} ${TEMP_DIR}
rm -rf "${TEMP_DIR}" rm -rf "${TEMP_DIR}"