Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Docker startup crash #313

Merged
merged 2 commits into from
Jul 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion mithril-aggregator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
###############################
# STEP 1: build rust executable
###############################
FROM rust:1.61 AS rustbuilder
FROM rust:buster AS rustbuilder

# Upgrade and install build base
RUN apt-get update && apt-get install -y libssl-dev
Expand Down
4 changes: 2 additions & 2 deletions mithril-aggregator/Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Creates a docker image to run an executable built outside of the image
# This relies on the fact the mithril-aggregator executable has been built
# on a debian-compatible x86-64 environment
FROM debian:buster-slim
FROM rust:latest

# Upgrade
RUN apt-get update && apt-get install -y libssl1.1 ca-certificates wget && rm -rf /var/lib/apt/lists/*
RUN apt-get update -y && apt-get install -y libssl1.1 ca-certificates wget && rm -rf /var/lib/apt/lists/*

# Create appuser
RUN adduser --no-create-home --disabled-password appuser
Expand Down
2 changes: 1 addition & 1 deletion mithril-client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
###############################
# STEP 1: build rust executable
###############################
FROM rust:1.61 AS rustbuilder
FROM rust:buster AS rustbuilder

# Upgrade and install build base
RUN apt-get update && apt-get install -y libssl-dev
Expand Down
4 changes: 2 additions & 2 deletions mithril-client/Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Creates a docker image to run an executable built outside of the image
# This relies on the fact the mithril-client executable has been built
# on a debian-compatible x86-64 environment
FROM debian:buster-slim
FROM rust:latest

# Upgrade
RUN apt-get update && apt-get install -y libssl1.1 ca-certificates && rm -rf /var/lib/apt/lists/*
RUN apt-get update -y && apt-get install -y libssl1.1 ca-certificates wget && rm -rf /var/lib/apt/lists/*

# Create appuser
RUN adduser --no-create-home --disabled-password appuser
Expand Down
4 changes: 2 additions & 2 deletions mithril-signer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
###############################
# STEP 1: build rust executable
###############################
FROM rust:1.61 AS rustbuilder
FROM rust:buster AS rustbuilder

# Upgrade and install build base
RUN apt-get update && apt-get install -y libssl-dev
Expand Down Expand Up @@ -35,7 +35,7 @@ RUN cargo build --release
FROM debian:buster-slim

# Upgrade
RUN apt-get update && apt-get install -y libssl1.1 ca-certificates wget && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install -y libssl1.1 ca-certificates && rm -rf /var/lib/apt/lists/*

# Import the user and group files from the builder
COPY --from=rustbuilder /etc/passwd /etc/passwd
Expand Down
4 changes: 2 additions & 2 deletions mithril-signer/Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Creates a docker image to run an executable built outside of the image
# This relies on the fact the mithril-signer executable has been built
# on a debian-compatible x86-64 environment
FROM debian:buster-slim
FROM rust:latest

# Upgrade
RUN apt-get update && apt-get install -y libssl1.1 ca-certificates wget && rm -rf /var/lib/apt/lists/*
RUN apt-get update -y && apt-get install -y libssl1.1 ca-certificates wget && rm -rf /var/lib/apt/lists/*

# Create appuser
RUN adduser --no-create-home --disabled-password appuser
Expand Down