Skip to content

Commit 2497577

Browse files
authored
Merge pull request #1448 from Concordium/fix-docker-image-build
Remove libgmp10 libssl1.1 from built docker image.
2 parents 03da5cb + 07c069a commit 2497577

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

scripts/distribution/docker/builder.Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
# The build of the image will clone the genesis data repository so needs
1818
# credentials to access it.
1919

20-
ARG static_binaries_image_tag
21-
FROM static-node-binaries:${static_binaries_image_tag} as binaries
20+
ARG static_binaries_image_tag=latest
21+
FROM static-node-binaries:${static_binaries_image_tag} AS binaries
2222

2323
# Fetch genesis-data.
24-
FROM alpine/git:latest as genesis-data
25-
ARG genesis_ref
26-
ARG genesis_path
24+
FROM alpine/git:latest AS genesis-data
25+
ARG genesis_ref=main
26+
ARG genesis_path=testnet/2022-06-13/genesis_data
2727
RUN mkdir -p -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
2828
RUN --mount=type=ssh git clone --depth 1 --branch "${genesis_ref}" [email protected]:Concordium/concordium-infra-genesis-data.git
2929
RUN mv "concordium-infra-genesis-data/${genesis_path}" /data
@@ -35,10 +35,10 @@ FROM ubuntu:24.04
3535
# - stagenet
3636
# - testnet
3737
# - mainnet
38-
ARG environment
38+
ARG environment=testnet
3939

4040
RUN apt-get update && \
41-
apt-get install -y libgmp10 libssl1.1 ca-certificates && \
41+
apt-get install -y ca-certificates && \
4242
rm -rf /var/lib/apt/lists/*
4343

4444
COPY --from=binaries /build/bin/concordium-node /concordium-node

scripts/distribution/ubuntu-packages/deb.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# The ubuntu version to build the package in. This influences the dependencies
22
# that will be added to the package. This should be the same as was used to
33
# build the binaries.
4-
ARG ubuntu_version
5-
ARG static_binaries_image_tag
4+
ARG ubuntu_version=latest
5+
ARG static_binaries_image_tag=latest
66

7-
FROM static-node-binaries:$static_binaries_image_tag as binaries
7+
FROM static-node-binaries:$static_binaries_image_tag AS binaries
88

99
COPY template /pkg-root
1010

0 commit comments

Comments
 (0)