Skip to content

Commit d09eaa8

Browse files
committed
Merge branch 'vm-change-docker-source' into 'main'
Source images from ECR cache rather than relying on the Docker hub See merge request lg/identity-pki!135
2 parents 0a22393 + a276fd2 commit d09eaa8

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use the official Ruby image because the Rails images have been deprecated
2-
FROM ruby:3.4.5-slim as build
2+
FROM public.ecr.aws/docker/library/ruby:3.4.5-slim as build
33

44
RUN apt-get update && \
55
apt-get install -y \
@@ -46,7 +46,7 @@ RUN mkdir -p /usr/local/share/aws \
4646

4747

4848
# Switch to base image
49-
FROM ruby:3.4.5-slim
49+
FROM public.ecr.aws/docker/library/ruby:3.4.5-slim
5050
WORKDIR /pivcac
5151

5252
RUN apt-get update && \

k8.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.4.9-slim-bookworm
1+
FROM public.ecr.aws/docker/library/ruby:3.4.9-slim-bookworm
22

33
SHELL ["/bin/bash", "-c"]
44

prod.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# this part builds everything
2-
FROM ruby:3.4.1-slim-bullseye as builder
2+
FROM public.ecr.aws/docker/library/ruby:3.4.1-slim-bullseye as builder
33

44
# Set environment variables
55
ENV RAILS_ROOT /app
@@ -53,7 +53,7 @@ RUN bundle binstubs --all
5353

5454
#####################################################
5555
# here is where the actual image gets built
56-
FROM ruby:3.4.1-slim-bullseye
56+
FROM public.ecr.aws/docker/library/ruby:3.4.1-slim-bullseye
5757

5858
SHELL ["/bin/bash", "-c"]
5959

0 commit comments

Comments
 (0)