Skip to content

Commit

Permalink
Remove sqlite & use earlier version in dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
Alenar committed Jul 11, 2023
1 parent e5549d3 commit 0df0ad7
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions mithril-aggregator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
###############################
# STEP 1: build rust executable
###############################
FROM ubuntu:22.04 AS rustbuilder
FROM ubuntu:20.04 AS rustbuilder

# Upgrade and install build base
RUN apt-get update && apt-get install -y libssl-dev curl wget build-essential pkg-config make m4
Expand Down Expand Up @@ -37,13 +37,13 @@ RUN /app/target/release/mithril-aggregator --version
###############################
# STEP 2: build a small image
###############################
FROM ubuntu:22.04
FROM debian:11-slim

# Args
ARG CARDANO_BIN_URL=https://github.com/input-output-hk/cardano-node/releases/download/8.1.1/cardano-node-8.1.1-linux.tar.gz

# Upgrade
RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget sqlite3 && rm -rf /var/lib/apt/lists/*
RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && 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-aggregator/Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# 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 ubuntu:22.04
FROM debian:11-slim

# Args
ARG CARDANO_BIN_URL=https://github.com/input-output-hk/cardano-node/releases/download/8.1.1/cardano-node-8.1.1-linux.tar.gz

# Upgrade
RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget sqlite3 && rm -rf /var/lib/apt/lists/*
RUN apt-get update -y && apt-get install -y libssl-dev 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-client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
###############################
# STEP 1: build rust executable
###############################
FROM ubuntu:22.04 AS rustbuilder
FROM ubuntu:20.04 AS rustbuilder

# Upgrade and install build base
RUN apt-get update && apt-get install -y libssl-dev curl wget build-essential pkg-config make m4
Expand Down Expand Up @@ -37,7 +37,7 @@ RUN /app/target/release/mithril-client --version
###############################
# STEP 2: build a small image
###############################
FROM ubuntu:22.04
FROM debian:11-slim

# Upgrade
RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && rm -rf /var/lib/apt/lists/*
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 ubuntu:22.04
FROM debian:11-slim

# Upgrade
RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget sqlite3 && rm -rf /var/lib/apt/lists/*
RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && rm -rf /var/lib/apt/lists/*

# Create appuser
RUN adduser --disabled-password appuser
Expand Down
6 changes: 3 additions & 3 deletions mithril-signer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
###############################
# STEP 1: build rust executable
###############################
FROM ubuntu:22.04 AS rustbuilder
FROM ubuntu:20.04 AS rustbuilder

# Upgrade and install build base
RUN apt-get update && apt-get install -y libssl-dev curl wget build-essential pkg-config make m4
Expand Down Expand Up @@ -38,13 +38,13 @@ RUN /app/target/release/mithril-signer --version
###############################
# STEP 2: build a small image
###############################
FROM ubuntu:22.04
FROM debian:11-slim

# Args
ARG CARDANO_BIN_URL=https://github.com/input-output-hk/cardano-node/releases/download/8.1.1/cardano-node-8.1.1-linux.tar.gz

# Upgrade
RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget sqlite3 && rm -rf /var/lib/apt/lists/*
RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && 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,13 +1,13 @@
# 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 ubuntu:22.04
FROM debian:11-slim

# Args
ARG CARDANO_BIN_URL=https://github.com/input-output-hk/cardano-node/releases/download/8.1.1/cardano-node-8.1.1-linux.tar.gz

# Upgrade
RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget sqlite3 && rm -rf /var/lib/apt/lists/*
RUN apt-get update -y && apt-get install -y libssl-dev ca-certificates wget && rm -rf /var/lib/apt/lists/*

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

0 comments on commit 0df0ad7

Please sign in to comment.