From 53b4c011b5c9be0f5a401669736087e2c0043fb0 Mon Sep 17 00:00:00 2001
From: Piotr Senkow <piotrsenkow@gmail.com>
Date: Fri, 1 Nov 2024 11:40:34 -0500
Subject: [PATCH 01/15] product day
---
Dockerfile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Dockerfile b/Dockerfile
index 9be23914..33a0f14f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,10 +11,14 @@ LABEL name="aws-es-proxy" \
RUN apk --no-cache add ca-certificates
WORKDIR /home/
+
+FROM scratch
+USER nobody
COPY --from=0 /go/src/github.com/abutaha/aws-es-proxy/aws-es-proxy /usr/local/bin/
ENV PORT_NUM 9200
EXPOSE ${PORT_NUM}
+
ENTRYPOINT ["aws-es-proxy"]
CMD ["-h"]
From ab0abc70dbdc7d6707e72708e5183095d8a42dd7 Mon Sep 17 00:00:00 2001
From: Piotr Senkow <piotrsenkow@gmail.com>
Date: Fri, 1 Nov 2024 13:04:05 -0500
Subject: [PATCH 02/15] adding password for nobody
---
Dockerfile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Dockerfile b/Dockerfile
index 33a0f14f..84cf7ae5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,10 +11,13 @@ LABEL name="aws-es-proxy" \
RUN apk --no-cache add ca-certificates
WORKDIR /home/
+RUN echo "nobody:x:65534:65534:Nobody:/:" > /etc_passwd
+
FROM scratch
USER nobody
COPY --from=0 /go/src/github.com/abutaha/aws-es-proxy/aws-es-proxy /usr/local/bin/
+COPY --from=0 /etc_passwd /etc/passwd
ENV PORT_NUM 9200
EXPOSE ${PORT_NUM}
From 23ed4dbc36c2c5e5696119939e766988a14e7739 Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Fri, 8 Nov 2024 11:08:33 -0600
Subject: [PATCH 03/15] Update Dockerfile
Nothing change to retrigger build
---
Dockerfile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 84cf7ae5..f97db269 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,13 +15,12 @@ RUN echo "nobody:x:65534:65534:Nobody:/:" > /etc_passwd
FROM scratch
-USER nobody
COPY --from=0 /go/src/github.com/abutaha/aws-es-proxy/aws-es-proxy /usr/local/bin/
COPY --from=0 /etc_passwd /etc/passwd
ENV PORT_NUM 9200
EXPOSE ${PORT_NUM}
-
+USER nobody
ENTRYPOINT ["aws-es-proxy"]
CMD ["-h"]
From 8ae5c46dc1a6ab765da284613b298fd2c94a6c32 Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Fri, 8 Nov 2024 11:30:16 -0600
Subject: [PATCH 04/15] Update Dockerfile
From 982d8dee6dab5465ca71755bfb2492d340f67366 Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Fri, 8 Nov 2024 11:30:53 -0600
Subject: [PATCH 05/15] Update Dockerfile
From 2c96d29148c8a2cfd040f8845612704fc573b593 Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Fri, 8 Nov 2024 11:33:55 -0600
Subject: [PATCH 06/15] Create image_build_push.yaml
---
.github/workflows/image_build_push.yaml | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 .github/workflows/image_build_push.yaml
diff --git a/.github/workflows/image_build_push.yaml b/.github/workflows/image_build_push.yaml
new file mode 100644
index 00000000..2221aee4
--- /dev/null
+++ b/.github/workflows/image_build_push.yaml
@@ -0,0 +1,13 @@
+name: Build Image and Push to Quay
+
+on: push
+
+jobs:
+ ci:
+ name: Build Image and Push to Quay
+ uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
+ secrets:
+ ECR_AWS_ACCESS_KEY_ID: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
+ ECR_AWS_SECRET_ACCESS_KEY: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
+ QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
+ QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
From 485a392d6568dea2fe08b550d946d04acd0afcc3 Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Fri, 8 Nov 2024 11:38:18 -0600
Subject: [PATCH 07/15] Update Dockerfile
---
Dockerfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index f97db269..1e1683e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine
+FROM golang:1.20-alpine AS builder
WORKDIR /go/src/github.com/abutaha/aws-es-proxy
COPY . .
@@ -15,8 +15,8 @@ RUN echo "nobody:x:65534:65534:Nobody:/:" > /etc_passwd
FROM scratch
-COPY --from=0 /go/src/github.com/abutaha/aws-es-proxy/aws-es-proxy /usr/local/bin/
-COPY --from=0 /etc_passwd /etc/passwd
+COPY --from=builder /go/src/github.com/abutaha/aws-es-proxy/aws-es-proxy /usr/local/bin/
+COPY --from=builder /etc_passwd /etc/passwd
ENV PORT_NUM 9200
EXPOSE ${PORT_NUM}
From a184e1a045dee51a0de9a9cf7ad53a5663d937c6 Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Fri, 8 Nov 2024 11:41:33 -0600
Subject: [PATCH 08/15] Update Dockerfile
---
Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 1e1683e6..08e19f6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,8 +15,9 @@ RUN echo "nobody:x:65534:65534:Nobody:/:" > /etc_passwd
FROM scratch
-COPY --from=builder /go/src/github.com/abutaha/aws-es-proxy/aws-es-proxy /usr/local/bin/
+
COPY --from=builder /etc_passwd /etc/passwd
+COPY --from=builder /go/src/github.com/abutaha/aws-es-proxy/aws-es-proxy /usr/local/bin/
ENV PORT_NUM 9200
EXPOSE ${PORT_NUM}
From 5784df6ceadfd16c7c3103bfd5344a0477baa963 Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Fri, 8 Nov 2024 11:49:39 -0600
Subject: [PATCH 09/15] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 08e19f6c..ff94b701 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ WORKDIR /go/src/github.com/abutaha/aws-es-proxy
COPY . .
RUN CGO_ENABLED=0 GOOS=linux go build -o aws-es-proxy
+RUN echo "nobody:x:65534:65534:Nobody:/:" > /etc_passwd
FROM alpine:3.17
LABEL name="aws-es-proxy" \
@@ -11,7 +12,6 @@ LABEL name="aws-es-proxy" \
RUN apk --no-cache add ca-certificates
WORKDIR /home/
-RUN echo "nobody:x:65534:65534:Nobody:/:" > /etc_passwd
FROM scratch
From 30cfa86915c0b0a8e9715feea28c7c06df7d1d31 Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Fri, 8 Nov 2024 12:09:24 -0600
Subject: [PATCH 10/15] Update Dockerfile
---
Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index ff94b701..46801059 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,11 +17,11 @@ WORKDIR /home/
FROM scratch
COPY --from=builder /etc_passwd /etc/passwd
-COPY --from=builder /go/src/github.com/abutaha/aws-es-proxy/aws-es-proxy /usr/local/bin/
+COPY --from=builder /go/src/github.com/abutaha/aws-es-proxy/aws-es-proxy /aws-es-proxy
ENV PORT_NUM 9200
EXPOSE ${PORT_NUM}
USER nobody
ENTRYPOINT ["aws-es-proxy"]
-CMD ["-h"]
+CMD ["-timeout=180", "-endpoint=\"https://$ES_ENDPOINT\"", "-verbose", "-listen=\":9200\""]
From 38c7c29e5052557d82c1a49eed8600b5ff44b97a Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Fri, 8 Nov 2024 12:22:59 -0600
Subject: [PATCH 11/15] Update Dockerfile
---
Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 46801059..c483a321 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,5 +23,5 @@ ENV PORT_NUM 9200
EXPOSE ${PORT_NUM}
USER nobody
-ENTRYPOINT ["aws-es-proxy"]
-CMD ["-timeout=180", "-endpoint=\"https://$ES_ENDPOINT\"", "-verbose", "-listen=\":9200\""]
+ENTRYPOINT ["/aws-es-proxy"]
+CMD ["-timeout", "180", "-endpoint", "https://$ES_ENDPOINT", "-verbose", "-listen", ":9200"]
From 6141773cddd868a5d426ceb289a8db8e905f3442 Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Fri, 8 Nov 2024 12:32:36 -0600
Subject: [PATCH 12/15] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index c483a321..b271a874 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,4 +24,4 @@ EXPOSE ${PORT_NUM}
USER nobody
ENTRYPOINT ["/aws-es-proxy"]
-CMD ["-timeout", "180", "-endpoint", "https://$ES_ENDPOINT", "-verbose", "-listen", ":9200"]
+CMD ["-timeout", "180", "-verbose", "-listen", ":9200"]
From 9cf5ed1754f73d2c3c8d9624329cf45bc03feb5a Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Fri, 8 Nov 2024 12:47:51 -0600
Subject: [PATCH 13/15] Update Dockerfile
---
Dockerfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Dockerfile b/Dockerfile
index b271a874..0e8b3d04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,7 @@ WORKDIR /home/
FROM scratch
COPY --from=builder /etc_passwd /etc/passwd
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /go/src/github.com/abutaha/aws-es-proxy/aws-es-proxy /aws-es-proxy
ENV PORT_NUM 9200
From ebd7d13459f89e1f48d40ff5d8dfc602053a02b0 Mon Sep 17 00:00:00 2001
From: Ed <emalinowski@uchicago.edu>
Date: Fri, 13 Dec 2024 07:04:12 -0600
Subject: [PATCH 14/15] Updated images to include /bin/sh for backwards
compatability
---
Dockerfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Dockerfile b/Dockerfile
index 0e8b3d04..1de710d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,6 +16,7 @@ WORKDIR /home/
FROM scratch
+COPY --from=busybox:1.35.0-uclibc /bin/sh /bin/sh
COPY --from=builder /etc_passwd /etc/passwd
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /go/src/github.com/abutaha/aws-es-proxy/aws-es-proxy /aws-es-proxy
From df030e233a7f37e697e86f11e472573be5942f93 Mon Sep 17 00:00:00 2001
From: emalinowski <emalinowski@uchicago.edu>
Date: Fri, 13 Dec 2024 07:20:48 -0600
Subject: [PATCH 15/15] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 1de710d2..fbd7bd69 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ COPY --from=builder /etc_passwd /etc/passwd
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /go/src/github.com/abutaha/aws-es-proxy/aws-es-proxy /aws-es-proxy
-ENV PORT_NUM 9200
+ENV PORT_NUM=9200
EXPOSE ${PORT_NUM}
USER nobody