Skip to content

Commit

Permalink
Update Dockerfiles to use corretto 17 java
Browse files Browse the repository at this point in the history
  • Loading branch information
aprudhomme committed Mar 6, 2024
1 parent 5637580 commit 8d01beb
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 3 deletions.
12 changes: 11 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
FROM azul/zulu-openjdk-debian:14
FROM debian:12

ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update && \
apt-get install -y wget gnupg2 software-properties-common

RUN wget -O- https://apt.corretto.aws/corretto.key | apt-key add -
RUN add-apt-repository -y 'deb https://apt.corretto.aws stable main'
# For some reason, needs to be run again for the repo to be usable
RUN add-apt-repository -y 'deb https://apt.corretto.aws stable main'
RUN apt-get update && \
apt-get install -y java-17-amazon-corretto-jdk

RUN mkdir /usr/app/
COPY . /user/app/
WORKDIR /user/app/
Expand Down
17 changes: 15 additions & 2 deletions grpc-gateway/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
FROM azul/zulu-openjdk-debian:14
FROM debian:12

RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y wget unzip htop \
golang-go \
git
git \
gnupg2 software-properties-common

RUN wget -O- https://apt.corretto.aws/corretto.key | apt-key add -
RUN add-apt-repository -y 'deb https://apt.corretto.aws stable main'
# For some reason, needs to be run again for the repo to be usable
RUN add-apt-repository -y 'deb https://apt.corretto.aws stable main'
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y java-17-amazon-corretto-jdk

# Install protoc
ENV PROTOC_VERSION=3.11.4
Expand Down Expand Up @@ -45,6 +53,11 @@ RUN go get \
github.com/golang/protobuf/protoc-gen-go@v${PROTOC_GEN_GO_VERSION} \
google.golang.org/grpc@v${GRPC_VERSION}

RUN go install \
github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway@v${GRPC_GATEWAY_VERSION} \
github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger@v${GRPC_GATEWAY_VERSION}
RUN go install github.com/golang/protobuf/protoc-gen-go@v${PROTOC_GEN_GO_VERSION}

ENV PROTO_PATH=/code/clientlib/src/main/proto
ENV PROTO_BUILD_PATH=/code/clientlib/build

Expand Down

0 comments on commit 8d01beb

Please sign in to comment.