Remove build_goreleaser folder (#3918)

* wip Signed-off-by: Chris Martin <chris@cmartinit.co.uk> * modify goreleaser Signed-off-by: Chris Martin <chris@cmartinit.co.uk> * add missing files Signed-off-by: Chris Martin <chris@cmartinit.co.uk> * fix imag location Signed-off-by: Chris Martin <chris@cmartinit.co.uk> --------- Signed-off-by: Chris Martin <chris@cmartinit.co.uk>
armadaproject · Sep 9, 2024 · 49ddb5c · 49ddb5c
1 parent 9fa77a0
commit 49ddb5c
Show file tree

Hide file tree

Showing 27 changed files with 110 additions and 249 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -203,7 +203,7 @@ dockers:
  - config/eventingester/config.yaml
  - config/scheduler/config.yaml
  - config/scheduleringester/config.yaml
- dockerfile: ./build_goreleaser/bundles/armada/Dockerfile
+ dockerfile: ./build/bundles/armada/Dockerfile
 
  - id: lookout-bundle
  use: buildx
@@ -222,7 +222,7 @@ dockers:
  - internal/lookout/ui
  - pkg/api/api.swagger.json
  - pkg/api/binoculars/api.swagger.json
- dockerfile: ./build_goreleaser/bundles/lookout/Dockerfile
+ dockerfile: ./build/bundles/lookout/Dockerfile
 
  - id: full-bundle
  use: buildx
@@ -255,7 +255,7 @@ dockers:
  - internal/lookout/ui
  - pkg/api/api.swagger.json
  - pkg/api/binoculars/api.swagger.json
- dockerfile: ./build_goreleaser/bundles/full/Dockerfile
+ dockerfile: ./build/bundles/full/Dockerfile
 
  - id: server
  use: buildx
@@ -269,7 +269,7 @@ dockers:
  - server
  extra_files:
  - config/armada/config.yaml
- dockerfile: ./build_goreleaser/server/Dockerfile
+ dockerfile: ./build/server/Dockerfile
 
  - id: executor
  use: buildx
@@ -283,7 +283,7 @@ dockers:
  - executor
  extra_files:
  - config/executor/config.yaml
- dockerfile: ./build_goreleaser/executor/Dockerfile
+ dockerfile: ./build/executor/Dockerfile
 
  - id: fakeexecutor
  use: buildx
@@ -297,7 +297,7 @@ dockers:
  - fakeexecutor
  extra_files:
  - config/executor/config.yaml
- dockerfile: ./build_goreleaser/fakeexecutor/Dockerfile
+ dockerfile: ./build/fakeexecutor/Dockerfile
 
  - id: armadaloadtester
  use: buildx
@@ -309,7 +309,7 @@ dockers:
  build_flag_templates: *BUILD_FLAG_TEMPLATES
  ids:
  - armadaloadtester
- dockerfile: ./build_goreleaser/loadtester/Dockerfile
+ dockerfile: ./build/loadtester/Dockerfile
 
  - id: testsuite
  use: buildx
@@ -321,7 +321,7 @@ dockers:
  build_flag_templates: *BUILD_FLAG_TEMPLATES
  ids:
  - testsuite
- dockerfile: ./build_goreleaser/testsuite/Dockerfile
+ dockerfile: ./build/testsuite/Dockerfile
 
  - id: lookoutingesterv2
  use: buildx
@@ -335,7 +335,7 @@ dockers:
  - lookoutingesterv2
  extra_files:
  - config/lookoutingesterv2/config.yaml
- dockerfile: ./build_goreleaser/lookoutingesterv2/Dockerfile
+ dockerfile: ./build/lookoutingesterv2/Dockerfile
 
  - id: lookoutv2
  use: buildx
@@ -354,7 +354,7 @@ dockers:
  - pkg/api/binoculars/api.swagger.json
  - config/lookoutv2/config.yaml
  - config/lookoutingesterv2/config.yaml
- dockerfile: ./build_goreleaser/lookoutv2/Dockerfile
+ dockerfile: ./build/lookoutv2/Dockerfile
 
  - id: eventingester
  use: buildx
@@ -368,7 +368,7 @@ dockers:
  - eventingester
  extra_files:
  - config/eventingester/config.yaml
- dockerfile: ./build_goreleaser/eventingester/Dockerfile
+ dockerfile: ./build/eventingester/Dockerfile
 
  - id: scheduler
  use: buildx
@@ -382,7 +382,7 @@ dockers:
  - scheduler
  extra_files:
  - config/scheduler/config.yaml
- dockerfile: ./build_goreleaser/scheduler/Dockerfile
+ dockerfile: ./build/scheduler/Dockerfile
 
  - id: scheduleringester
  use: buildx
@@ -396,7 +396,7 @@ dockers:
  - scheduleringester
  extra_files:
  - config/scheduleringester/config.yaml
- dockerfile: ./build_goreleaser/scheduleringester/Dockerfile
+ dockerfile: ./build/scheduleringester/Dockerfile
 
  - id: binoculars
  use: buildx
@@ -410,7 +410,7 @@ dockers:
  - binoculars
  extra_files:
  - config/binoculars/config.yaml
- dockerfile: ./build_goreleaser/binoculars/Dockerfile
+ dockerfile: ./build/binoculars/Dockerfile
 
  - id: armadactl
  use: buildx
@@ -422,7 +422,7 @@ dockers:
  build_flag_templates: *BUILD_FLAG_TEMPLATES
  ids:
  - armadactl
- dockerfile: ./build_goreleaser/armadactl/Dockerfile
+ dockerfile: ./build/armadactl/Dockerfile
 
 changelog:
  use:

diff --git a/build/armada/Dockerfile b/build/armada/Dockerfile
diff --git a/build/armadactl/Dockerfile b/build/armadactl/Dockerfile
@@ -1,10 +1,14 @@
-FROM alpine:3.20.2
+ARG BASE_IMAGE=alpine:3.20.2
+FROM ${BASE_IMAGE}
 
-RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
+LABEL org.opencontainers.image.title=armadactl
+LABEL org.opencontainers.image.description="ArmadaCTL"
+LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearch/armadactl
 
+RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 USER armada
 
-COPY ./armadactl /app/
+COPY armadactl /app/
 
 WORKDIR /app
 

diff --git a/build/binoculars/Dockerfile b/build/binoculars/Dockerfile
@@ -1,12 +1,14 @@
-FROM alpine:3.20.2
+ARG BASE_IMAGE=alpine:3.20.2
+FROM ${BASE_IMAGE}
+LABEL org.opencontainers.image.title=binoculars
+LABEL org.opencontainers.image.description="binoculars"
+LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearch/binoculars
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
-
 USER armada
 
-COPY ./binoculars /app/
-
-COPY /config/ /app/config/binoculars
+COPY binoculars /app/
+COPY config/binoculars/config.yaml /app/config/binoculars/config.yaml
 
 WORKDIR /app
 

diff --git a/build_goreleaser/bundles/armada/Dockerfile → build/bundles/armada/Dockerfile b/build_goreleaser/bundles/armada/Dockerfile → build/bundles/armada/Dockerfile
@@ -2,7 +2,7 @@ ARG BASE_IMAGE=alpine:3.20.2
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=armada
 LABEL org.opencontainers.image.description="Armada Bundle"
-LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearchdev/armada
+LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearch/armada
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 USER armada

diff --git a/build_goreleaser/bundles/full/Dockerfile → build/bundles/full/Dockerfile b/build_goreleaser/bundles/full/Dockerfile → build/bundles/full/Dockerfile
@@ -5,7 +5,7 @@ ARG BASE_IMAGE=alpine:3.20.2
 FROM ${OPENAPI_BUILD_IMAGE} AS OPENAPI
 LABEL org.opencontainers.image.title=armada-full-bundle
 LABEL org.opencontainers.image.description="Armada Full Bundle"
-LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearchdev/armada-full-bundle
+LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearch/armada-full-bundle
 COPY internal/lookout/ui /project/internal/lookout/ui
 COPY pkg/api/*.swagger.json /project/pkg/api/
 COPY pkg/api/binoculars/*.swagger.json /project/pkg/api/binoculars/

diff --git a/build_goreleaser/bundles/lookout/Dockerfile → build/bundles/lookout/Dockerfile b/build_goreleaser/bundles/lookout/Dockerfile → build/bundles/lookout/Dockerfile
@@ -3,7 +3,7 @@ ARG BASE_IMAGE=alpine:3.20.2
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=armada-lookout-bundle
 LABEL org.opencontainers.image.description="Armada Lookout Bundle"
-LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearchdev/armada-lookout-bundle
+LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearch/armada-lookout-bundle
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 USER armada

diff --git a/build/eventingester/Dockerfile b/build/eventingester/Dockerfile
@@ -1,13 +1,13 @@
-FROM alpine:3.20.2
+ARG BASE_IMAGE=alpine:3.20.2
 
-RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
+FROM ${BASE_IMAGE}
+LABEL org.opencontainers.image.title=eventingester
+LABEL org.opencontainers.image.description="Event Ingester"
+LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearch/eventingester
 
+RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 USER armada
-
-COPY ./eventingester /app/
-
-COPY ./config/ /app/config/eventingester
-
+COPY eventingester /app/
+COPY config/eventingester/config.yaml /app/config/eventingester/config.yaml
 WORKDIR /app
-
 ENTRYPOINT ["./eventingester"]
diff --git a/build/executor/Dockerfile b/build/executor/Dockerfile
@@ -1,12 +1,15 @@
-FROM alpine:3.20.2
+ARG BASE_IMAGE=alpine:3.20.2
 
-RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
+FROM ${BASE_IMAGE}
+LABEL org.opencontainers.image.title=executor
+LABEL org.opencontainers.image.description="Executor"
+LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearch/executor
 
+RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 USER armada
 
-COPY ./executor /app/
-
-COPY /config/ /app/config/executor
+COPY executor /app/
+COPY config/executor/config.yaml /app/config/executor/config.yaml
 
 WORKDIR /app
 

diff --git a/build/fakeexecutor/Dockerfile b/build/fakeexecutor/Dockerfile
@@ -1,12 +1,14 @@
-FROM alpine:3.20.2
+ARG BASE_IMAGE=alpine:3.20.2
+FROM ${BASE_IMAGE}
+LABEL org.opencontainers.image.title=fakeexecutor
+LABEL org.opencontainers.image.description="Fake Executor"
+LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearch/armada-fakeexecutor
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
-
 USER armada
 
-COPY ./fakeexecutor /app/
-
-COPY /config/ /app/config/executor
+COPY fakeexecutor /app/
+COPY config/executor/config.yaml /app/config/executor/config.yaml
 
 WORKDIR /app
 

diff --git a/build_goreleaser/loadtester/Dockerfile → build/loadtester/Dockerfile b/build_goreleaser/loadtester/Dockerfile → build/loadtester/Dockerfile
diff --git a/build/lookoutingesterv2/Dockerfile b/build/lookoutingesterv2/Dockerfile
@@ -1,12 +1,15 @@
-FROM alpine:3.20.2
+ARG BASE_IMAGE=alpine:3.20.2
 
-RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
+FROM ${BASE_IMAGE}
+LABEL org.opencontainers.image.title=lookoutingesterv2
+LABEL org.opencontainers.image.description="Lookout Ingester V2"
+LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearch/lookoutingesterv2
 
+RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 USER armada
 
-COPY ./lookoutingesterv2 /app/
-
-COPY ./config/ /app/config/lookoutingesterv2
+COPY lookoutingesterv2 /app/
+COPY config/lookoutingesterv2/config.yaml /app/config/lookoutingesterv2/config.yaml
 
 WORKDIR /app
 

diff --git a/build/lookoutv2/Dockerfile b/build/lookoutv2/Dockerfile
@@ -1,13 +1,30 @@
-FROM alpine:3.20.2
+ARG NODE_BUILD_IMAGE=node:16.14-buster
+ARG OPENAPI_BUILD_IMAGE=openapitools/openapi-generator-cli:v5.4.0
+ARG BASE_IMAGE=alpine:3.20.2
 
-RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
+FROM ${OPENAPI_BUILD_IMAGE} AS OPENAPI
 
-USER armada
+COPY internal/lookout/ui /project/internal/lookout/ui
+COPY pkg/api/*.swagger.json /project/pkg/api/
+COPY pkg/api/binoculars/*.swagger.json /project/pkg/api/binoculars/
+RUN ./project/internal/lookout/ui/openapi.sh
 
-COPY ./lookoutv2 /app/
-COPY ./internal/lookout/ui/build/ /app/internal/lookout/ui/build
-COPY ./config/ /app/config/lookoutv2
+FROM ${NODE_BUILD_IMAGE} AS NODE
+COPY --from=OPENAPI /project/internal/lookout/ui /ui/
+WORKDIR /ui
+RUN yarn install --immutable
+RUN yarn run build
 
+FROM ${BASE_IMAGE}
+RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
+LABEL org.opencontainers.image.title=lookoutv2
+LABEL org.opencontainers.image.description="Lookout V2"
+LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearch/lookoutv2
+USER armada
+COPY --from=NODE /ui/build/ /app/internal/lookout/ui/build
+COPY lookoutv2 /app/
+COPY config/lookoutv2/config.yaml /app/config/lookoutv2/config.yaml
+COPY lookoutingesterv2 /app/
+COPY config/lookoutingesterv2/ /app/config/lookoutingesterv2
 WORKDIR /app
-
 ENTRYPOINT ["./lookoutv2"]
diff --git a/build/scheduler/Dockerfile b/build/scheduler/Dockerfile
@@ -1,13 +1,13 @@
-FROM alpine:3.20.2
+ARG BASE_IMAGE=alpine:3.20.2
 
-RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
+FROM ${BASE_IMAGE}
+LABEL org.opencontainers.image.title=scheduler
+LABEL org.opencontainers.image.description="Scheduler"
+LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearch/scheduler
 
+RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 USER armada
-
-COPY ./scheduler /app/
-
-COPY ./config/ /app/config/scheduler
-
+COPY scheduler /app/
+COPY config/scheduler/config.yaml /app/config/scheduler/config.yaml
 WORKDIR /app
-
 ENTRYPOINT ["./scheduler"]
diff --git a/build/scheduleringester/Dockerfile b/build/scheduleringester/Dockerfile
@@ -1,13 +1,13 @@
-FROM alpine:3.20.2
+ARG BASE_IMAGE=alpine:3.20.2
 
-RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
+FROM ${BASE_IMAGE}
+LABEL org.opencontainers.image.title=scheduleringester
+LABEL org.opencontainers.image.description="Scheduler Ingester"
+LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearch/scheduleringester
 
+RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 USER armada
-
-COPY ./scheduleringester /app/
-
-COPY ./config/ /app/config/scheduleringester
-
+COPY scheduleringester /app/
+COPY config/scheduleringester/config.yaml /app/config/scheduleringester/config.yaml
 WORKDIR /app
-
 ENTRYPOINT ["./scheduleringester"]
diff --git a/build_goreleaser/server/Dockerfile → build/server/Dockerfile b/build_goreleaser/server/Dockerfile → build/server/Dockerfile
@@ -3,7 +3,7 @@ ARG BASE_IMAGE=alpine:3.20.2
 FROM ${BASE_IMAGE}
 LABEL org.opencontainers.image.title=armada-server
 LABEL org.opencontainers.image.description="Armada Server"
-LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearchdev/armada-server
+LABEL org.opencontainers.image.url=https://hub.docker.com/r/gresearch/armada-server
 
 RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada
 USER armada