From 550c9f654ae82c201b01ef1f63011d91fe19cb1e Mon Sep 17 00:00:00 2001 From: Vo Van Nghia Date: Tue, 7 Nov 2023 12:11:55 +0100 Subject: [PATCH 1/3] enable multiarch image --- tools/deploy_docker.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/deploy_docker.sh b/tools/deploy_docker.sh index 5ac6586e..fed4828d 100755 --- a/tools/deploy_docker.sh +++ b/tools/deploy_docker.sh @@ -19,9 +19,11 @@ else DOCKER_TAG="$TRAVIS_BRANCH" fi +docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD" -docker build -f tools/Dockerfile -t "$IMAGE_NAME":"$DOCKER_TAG" . +docker buildx build --platform linux/amd64,linux/arm64 -f tools/Dockerfile -t "$IMAGE_NAME":"$DOCKER_TAG" . echo "NEW_GIT_TAG=$NEW_GIT_TAG" if [ ! -z "$NEW_GIT_TAG" ]; then From b558807fb7943074338cf7b53be4599af6b2c6a6 Mon Sep 17 00:00:00 2001 From: Vo Van Nghia Date: Tue, 7 Nov 2023 18:17:43 +0100 Subject: [PATCH 2/3] install docker buildx --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index cfb1fcfd..b63bb245 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,9 @@ before_install: - sudo apt-get -y install python3-pip python3-setuptools apache2-utils python3-venv - wget https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/116.0.5845.96/linux64/chromedriver-linux64.zip - unzip chromedriver-linux64.zip -d $HOME/.local/bin + - mkdir -vp ~/.docker/cli-plugins/ + - curl --silent -L "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64" > ~/.docker/cli-plugins/docker-buildx + - chmod a+x ~/.docker/cli-plugins/docker-buildx install: - pip3 install -r requirements.txt - pip3 install pyasn1 --upgrade From bbc50d5e22d1c1aed86961ae69962e9137607d56 Mon Sep 17 00:00:00 2001 From: Vo Van Nghia Date: Wed, 8 Nov 2023 08:38:18 +0100 Subject: [PATCH 3/3] create new docker builder --- tools/deploy_docker.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/deploy_docker.sh b/tools/deploy_docker.sh index fed4828d..73306b4a 100755 --- a/tools/deploy_docker.sh +++ b/tools/deploy_docker.sh @@ -23,11 +23,11 @@ docker run --rm --privileged multiarch/qemu-user-static --reset -p yes docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD" -docker buildx build --platform linux/amd64,linux/arm64 -f tools/Dockerfile -t "$IMAGE_NAME":"$DOCKER_TAG" . +docker buildx create --use +docker buildx build --platform linux/amd64,linux/arm64 --push -f tools/Dockerfile -t "$IMAGE_NAME":"$DOCKER_TAG" . echo "NEW_GIT_TAG=$NEW_GIT_TAG" if [ ! -z "$NEW_GIT_TAG" ]; then docker tag "$IMAGE_NAME":"$DOCKER_TAG" "$IMAGE_NAME":"$NEW_GIT_TAG" + docker push "$IMAGE_NAME":"$NEW_GIT_TAG" fi - -docker push --all-tags "$IMAGE_NAME"