From 3da4124ac162faa8eec44d022d70e362c8745342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sat, 8 Aug 2020 09:30:59 +0200 Subject: [PATCH] clean: Remove support for ARM v7 --- .github/workflows/publish.yml | 2 +- assets/build/install.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8f82b2ff..71e6519f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,7 +11,7 @@ on: env: GITHUB_REF_NAME: ${{ github.event.release.tag_name }} IMAGE_NAME: cdalvaro/saltstack-master - PLATFORMS: linux/amd64 linux/arm64 linux/arm/v7 + PLATFORMS: linux/amd64 linux/arm64 DOCKER_CLI_EXPERIMENTAL: enabled jobs: diff --git a/assets/build/install.sh b/assets/build/install.sh index 7d581de5..275d7de0 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -30,7 +30,7 @@ EOF # Compile libssh2 echo "Building libssh2 v${LIBSSH2_VERSION} ..." -wget "https://github.com/libssh2/libssh2/archive/libssh2-${LIBSSH2_VERSION}.tar.gz" --no-check-certificate +wget "https://github.com/libssh2/libssh2/archive/libssh2-${LIBSSH2_VERSION}.tar.gz" tar xzf "libssh2-${LIBSSH2_VERSION}.tar.gz" cd "libssh2-libssh2-${LIBSSH2_VERSION}/" cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DENABLE_ZLIB_COMPRESSION=ON . @@ -38,7 +38,7 @@ cmake --build . --target install # Compile libgit2 echo "Building libgit2 v${LIBGIT2_VERSION} ..." -wget "https://github.com/libgit2/libgit2/archive/v${LIBGIT2_VERSION}.tar.gz" --no-check-certificate +wget "https://github.com/libgit2/libgit2/archive/v${LIBGIT2_VERSION}.tar.gz" tar xzf "v${LIBGIT2_VERSION}.tar.gz" cd "libgit2-${LIBGIT2_VERSION}/" cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DBUILD_CLAR=OFF -DTHREADSAFE=ON . @@ -68,7 +68,7 @@ SALT_BOOTSTRAP_OPTS=( -M -N -X -d -P -p salt-api -p salt-call -x "python${PYTHON echo "Installing saltstack ..." echo "Option: ${SALT_BOOTSTRAP_OPTS[@]}" -wget -O bootstrap-salt.sh https://bootstrap.saltstack.com --no-check-certificate +wget -O bootstrap-salt.sh https://bootstrap.saltstack.com sh bootstrap-salt.sh ${SALT_BOOTSTRAP_OPTS[@]} git "v${SALT_VERSION}" chown -R "${SALT_USER}": "${SALT_ROOT_DIR}"