Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
build-staging:
image: registry.ddbuild.io/docker:20.10.3
rules:
- if: '$CI_COMMIT_REF_NAME != "master"'
tags: ["runner:docker"]
script:
- docker build -t registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA} --label target=staging .
- docker push registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}

build-prod:
image: registry.ddbuild.io/docker:20.10.3
rules:
- if: '$CI_COMMIT_REF_NAME == "master"'
tags: ["runner:docker"]
script:
- docker build -t registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA} --label target=prod .
- docker build -t registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA} --label target=prod --target dd-image -f Dockerfile .
- docker push registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
8 changes: 7 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:21.04
FROM ubuntu:22.04 as base

# Install pre-reqs
ARG DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -69,3 +69,9 @@ RUN apt clean

COPY entrypoint.sh /
ENTRYPOINT ["/entrypoint.sh"]

FROM registry.ddbuild.io/images/base/gbi-ubuntu_2204 as dd-image

COPY --from=base /entrypoint.sh /
COPY --from=base /go/bin /usr/bin
ENTRYPOINT ["/entrypoint.sh"]
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ services:
build:
context: .
dockerfile: Dockerfile
target: base
ports:
- "8080"
- "8090"
Expand Down