From 0ce1abfe7b14ee47d49e91d38c9be9ce8f85e4e3 Mon Sep 17 00:00:00 2001 From: Isabel Tomb Date: Mon, 12 Sep 2022 08:49:46 -0500 Subject: [PATCH] Update splinter-dev image to v14 Update the splinter-dev image used for docker to v14, which removes transact dependencies and has the updated sawtooth dependencies. Signed-off-by: Isabel Tomb --- ci/splinter-dev-buildx | 6 +++--- ci/splinter-dev.yaml | 2 +- cli/Dockerfile-installed-jammy | 2 +- docker/lint.dockerfile | 2 +- services/scabbard/cli/Dockerfile-installed-jammy | 2 +- splinterd/Dockerfile-installed-jammy | 2 +- tests/Dockerfile | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/splinter-dev-buildx b/ci/splinter-dev-buildx index 880f3e2ae..10049946d 100755 --- a/ci/splinter-dev-buildx +++ b/ci/splinter-dev-buildx @@ -17,7 +17,7 @@ set -e docker buildx build \ --platform linux/amd64,linux/arm64 \ - -t ghcr.io/splintercommunity/splinter-dev:v13 \ + -t ghcr.io/splintercommunity/splinter-dev:v14 \ -f ci/splinter-dev.dockerfile \ --push . @@ -25,5 +25,5 @@ docker run quay.io/skopeo/stable \ copy \ --dest-creds "${DOCKER_HUB_USERNAME}:${DOCKER_HUB_ACCESS_TOKEN}" \ --multi-arch all \ - "docker://ghcr.io/splintercommunity/splinter-dev:v13" \ - "docker://docker.io/splintercommunity/splinter-dev:v13" + "docker://ghcr.io/splintercommunity/splinter-dev:v14" \ + "docker://docker.io/splintercommunity/splinter-dev:v14" diff --git a/ci/splinter-dev.yaml b/ci/splinter-dev.yaml index 74b07a55a..0fc9d2c64 100644 --- a/ci/splinter-dev.yaml +++ b/ci/splinter-dev.yaml @@ -17,7 +17,7 @@ version: '3.7' services: splinter-dev: - image: splintercommunity/splinter-dev:v13 + image: splintercommunity/splinter-dev:v14 build: context: .. dockerfile: ci/splinter-dev.dockerfile diff --git a/cli/Dockerfile-installed-jammy b/cli/Dockerfile-installed-jammy index a8ad37815..09dfd6e54 100644 --- a/cli/Dockerfile-installed-jammy +++ b/cli/Dockerfile-installed-jammy @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM splintercommunity/splinter-dev:v13 as BUILDER +FROM splintercommunity/splinter-dev:v14 as BUILDER ENV SPLINTER_FORCE_PANDOC=true diff --git a/docker/lint.dockerfile b/docker/lint.dockerfile index c73e25c5d..7a977ed25 100644 --- a/docker/lint.dockerfile +++ b/docker/lint.dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM splintercommunity/splinter-dev:v13 +FROM splintercommunity/splinter-dev:v14 ENV PATH=$PATH:/project/splinter/bin diff --git a/services/scabbard/cli/Dockerfile-installed-jammy b/services/scabbard/cli/Dockerfile-installed-jammy index 833939e1d..971a5a3d6 100644 --- a/services/scabbard/cli/Dockerfile-installed-jammy +++ b/services/scabbard/cli/Dockerfile-installed-jammy @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM splintercommunity/splinter-dev:v13 as BUILDER +FROM splintercommunity/splinter-dev:v14 as BUILDER # Copy over splinter files COPY Cargo.toml /build/Cargo.toml diff --git a/splinterd/Dockerfile-installed-jammy b/splinterd/Dockerfile-installed-jammy index f81549120..cccd9b005 100644 --- a/splinterd/Dockerfile-installed-jammy +++ b/splinterd/Dockerfile-installed-jammy @@ -14,7 +14,7 @@ # -------------=== splinterd docker build ===------------- -FROM splintercommunity/splinter-dev:v13 as BUILDER +FROM splintercommunity/splinter-dev:v14 as BUILDER ENV SPLINTER_FORCE_PANDOC=true diff --git a/tests/Dockerfile b/tests/Dockerfile index 892a3fc7c..77bbe2878 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM splintercommunity/splinter-dev:v13 +FROM splintercommunity/splinter-dev:v14 RUN apt-get update \ && apt-get install -y --no-install-recommends \