Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

dockerfiles: upgrade to ubuntu:20.04; some chore #3828

Merged
merged 3 commits into from
Sep 13, 2021
Merged

dockerfiles: upgrade to ubuntu:20.04; some chore #3828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f07a14
dockerfiles: upgrade to ubuntu:20.04; some chore
TriplEight Sep 10, 2021
dfe7c9a
dockerfiles: fq container names
TriplEight Sep 13, 2021
b8efe9c
Merge branch 'master' into 3x8_upgrade_to_ubuntu2004
TriplEight Sep 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bridges/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#
# See the `deployments/README.md` for all the available `PROJECT` values.

FROM paritytech/bridges-ci:latest as builder
FROM docker.io/paritytech/bridges-ci:latest as builder
WORKDIR /parity-bridges-common

COPY . .
Expand All @@ -19,7 +19,7 @@ RUN cargo build --release --verbose -p ${PROJECT} && \

# In this final stage we copy over the final binary and do some checks
# to make sure that everything looks good.
FROM ubuntu:20.04 as runtime
FROM docker.io/library/ubuntu:20.04 as runtime

# show backtraces
ENV RUST_BACKTRACE 1
Expand Down
2 changes: 1 addition & 1 deletion bridges/ci.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is a "runtime" part from a builder-pattern in Dockerfile, it's used in CI.
# The only different part is that the compilation happens externally,
# so COPY has a different source.
FROM ubuntu:20.04
FROM docker.io/library/ubuntu:20.04

# show backtraces
ENV RUST_BACKTRACE 1
Expand Down
2 changes: 1 addition & 1 deletion bridges/deployments/BridgeDeps.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# This image is meant to be used as a building block when building images for
# the various components in the bridge repo, such as nodes and relayers.
FROM ubuntu:20.04
FROM docker.io/library/ubuntu:20.04

ENV LAST_DEPS_UPDATE 2021-04-01
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
4 changes: 2 additions & 2 deletions bridges/deployments/bridges/poa-rialto/Front-end.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12 as build-deps
FROM docker.io/library/node:12 as build-deps

# install tools and dependencies
RUN set -eux; \
Expand All @@ -19,7 +19,7 @@ ENV EXPECTED_ETHEREUM_NETWORK_ID $EXPECTED_ETHEREUM_NETWORK_ID
RUN yarn build:docker

# Stage 2 - the production environment
FROM nginx:1.12
FROM docker.io/library/nginx:1.12
COPY --from=build-deps /usr/src/bridge-ui/nginx/*.conf /etc/nginx/conf.d/
COPY --from=build-deps /usr/src/bridge-ui/dist /usr/share/nginx/html
EXPOSE 80
Expand Down
2 changes: 1 addition & 1 deletion bridges/deployments/monitoring/GrafanaMatrix.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:alpine
FROM docker.io/library/ruby:alpine

RUN apk add --no-cache git

Expand Down
4 changes: 2 additions & 2 deletions bridges/deployments/networks/OpenEthereum.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:xenial AS builder
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tomusdrw is this image relevant to Polkadot?
Also, Xenial (16.04) is out of standard support since April 2021, our containers policy is not happy.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No I don't think so. If possible please avoid touching bridges code in this repo, it's only a clone of the bridges repository and the changes are better done there first and then synced here to avoid conflicts.

Is it caught by some blanket CI checks? Can we ignore bridges sub-dir from any checks of this kind? In the future the plan is to integrate the bridges code more closely with Polkadot/Substrate repositories, but for now we would rather keep focus on making sure the code works correctly in our repo.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, a more general question was "what the entire bridges repo does here?" and now I get it, thanks. I'll make a change in bridges then.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a git subtree, because we want to use some of the crates from bridges repo, but keep working on the separately. Other option is referencing crates using git repo, but that makes it cumbersome in case of compilation errors (i.e. companion PR system).

FROM docker.io/library/ubuntu:xenial AS builder

# show backtraces
ENV RUST_BACKTRACE 1
Expand Down Expand Up @@ -60,7 +60,7 @@ WORKDIR /openethereum
RUN cargo build --release --verbose
RUN strip ./target/release/openethereum

FROM ubuntu:xenial
FROM docker.io/library/ubuntu:xenial

# show backtraces
ENV RUST_BACKTRACE 1
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM paritytech/ci-linux:production as builder
FROM docker.io/paritytech/ci-linux:production as builder
LABEL description="This is the build stage for Polkadot. Here we create the binary."

ARG PROFILE=release
Expand All @@ -10,7 +10,7 @@ RUN cargo build --$PROFILE

# ===== SECOND STAGE ======

FROM debian:buster-slim
FROM docker.io/library/ubuntu:20.04
LABEL description="This is the 2nd stage: a very small image where we copy the Polkadot binary."
ARG PROFILE=release
COPY --from=builder /polkadot/target/$PROFILE/polkadot /usr/local/bin
Expand Down
4 changes: 2 additions & 2 deletions scripts/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM docker.io/library/ubuntu:20.04

# metadata
ARG VCS_REF
Expand All @@ -8,7 +8,7 @@ ARG IMAGE_NAME
LABEL io.parity.image.authors="[email protected]" \
io.parity.image.vendor="Parity Technologies" \
io.parity.image.title="${IMAGE_NAME}" \
io.parity.image.description="polkadot: a platform for web3" \
io.parity.image.description="Polkadot: a platform for web3" \
io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/docker/Dockerfile" \
io.parity.image.revision="${VCS_REF}" \
io.parity.image.created="${BUILD_DATE}" \
Expand Down
7 changes: 4 additions & 3 deletions scripts/docker/collator.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM debian:buster-slim
# this file copies from scripts/docker/Dockerfile and changes only the binary name
FROM docker.io/library/ubuntu:20.04

# metadata
ARG VCS_REF
Expand All @@ -8,8 +9,8 @@ ARG IMAGE_NAME
LABEL io.parity.image.authors="[email protected]" \
io.parity.image.vendor="Parity Technologies" \
io.parity.image.title="${IMAGE_NAME}" \
io.parity.image.description="polkadot: a platform for web3" \
io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/docker/Dockerfile" \
io.parity.image.description="adder-collator image" \
io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/docker/collator.Dockerfile" \
io.parity.image.revision="${VCS_REF}" \
io.parity.image.created="${BUILD_DATE}" \
io.parity.image.documentation="https://github.com/paritytech/polkadot/"
Expand Down
40 changes: 20 additions & 20 deletions scripts/docker/release.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM docker.io/library/ubuntu:20.04

# metadata
ARG VCS_REF
Expand All @@ -8,7 +8,7 @@ ARG POLKADOT_VERSION
LABEL io.parity.image.authors="[email protected]" \
io.parity.image.vendor="Parity Technologies" \
io.parity.image.title="parity/polkadot" \
io.parity.image.description="polkadot: a platform for web3" \
io.parity.image.description="Polkadot: a platform for web3" \
io.parity.image.source="https://github.com/paritytech/polkadot/blob/${VCS_REF}/scripts/docker/Dockerfile" \
io.parity.image.revision="${VCS_REF}" \
io.parity.image.created="${BUILD_DATE}" \
Expand All @@ -19,24 +19,25 @@ ENV RUST_BACKTRACE 1

# install tools and dependencies
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
libssl1.1 \
ca-certificates \
curl \
gnupg && \
useradd -m -u 1000 -U -s /bin/sh -d /polkadot polkadot && \
gpg --recv-keys --keyserver hkps://keys.mailvelope.com 9D4B2B6EB8F97156D19669A9FF0812D491B96798 && \
gpg --export 9D4B2B6EB8F97156D19669A9FF0812D491B96798 > /usr/share/keyrings/parity.gpg && \
echo 'deb [signed-by=/usr/share/keyrings/parity.gpg] https://releases.parity.io/deb release main' > /etc/apt/sources.list.d/parity.list && \
apt-get update && \
apt-get install -y --no-install-recommends polkadot=${POLKADOT_VERSION#?} && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
libssl1.1 \
ca-certificates \
curl \
chevdor marked this conversation as resolved.
Show resolved Hide resolved
gnupg && \
useradd -m -u 1000 -U -s /bin/sh -d /polkadot polkadot && \
# add repo's gpg keys and install the published polkadot binary
gpg --recv-keys --keyserver hkps://keys.mailvelope.com 9D4B2B6EB8F97156D19669A9FF0812D491B96798 && \
chevdor marked this conversation as resolved.
Show resolved Hide resolved
gpg --export 9D4B2B6EB8F97156D19669A9FF0812D491B96798 > /usr/share/keyrings/parity.gpg && \
echo 'deb [signed-by=/usr/share/keyrings/parity.gpg] https://releases.parity.io/deb release main' > /etc/apt/sources.list.d/parity.list && \
apt-get update && \
apt-get install -y --no-install-recommends polkadot=${POLKADOT_VERSION#?} && \
# apt cleanup
apt-get autoremove -y && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* ; \
mkdir -p /data /polkadot/.local/share && \
chown -R polkadot:polkadot /data && \
ln -s /data /polkadot/.local/share/polkadot
apt-get autoremove -y && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* ; \
mkdir -p /data /polkadot/.local/share && \
chown -R polkadot:polkadot /data && \
ln -s /data /polkadot/.local/share/polkadot

USER polkadot

Expand All @@ -47,4 +48,3 @@ EXPOSE 30333 9933 9944
VOLUME ["/polkadot"]

ENTRYPOINT ["/usr/bin/polkadot"]

4 changes: 2 additions & 2 deletions scripts/docker/staking-miner/staking_miner-builder.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN cargo build --locked --$PROFILE --package staking-miner

# ===== SECOND STAGE ======

FROM debian:buster-slim
FROM docker.io/library/ubuntu:20.04
LABEL description="This is the 2nd stage: a very small image where we copy the binary."
LABEL io.parity.image.authors="[email protected]" \
io.parity.image.vendor="Parity Technologies" \
Expand Down Expand Up @@ -43,4 +43,4 @@ ENV RUST_LOG="info"
# check if the binary works in this container
RUN /usr/local/bin/staking-miner --version

ENTRYPOINT [ "/usr/local/bin/staking-miner"]
ENTRYPOINT [ "/usr/local/bin/staking-miner" ]
3 changes: 2 additions & 1 deletion scripts/docker/staking-miner/staking_miner-injected.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM docker.io/library/ubuntu:20.04

# metadata
ARG VCS_REF
Expand All @@ -22,6 +22,7 @@ RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
libssl1.1 \
ca-certificates && \
# apt cleanup
apt-get autoremove -y && \
apt-get clean && \
find /var/lib/apt/lists/ -type f -not -name lock -delete; \
Expand Down