Skip to content

Commit 19083af

Browse files
schuellerfschuellerf
committed
backup
1 parent c8df7a4 commit 19083af

File tree

14 files changed

+344
-39
lines changed

14 files changed

+344
-39
lines changed

‎Makefile‎

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,37 @@ MAKE_SUB_CALL := make CONTAINER_EXECUTABLE="$(CONTAINER_EXECUTABLE)"
3232
# osbuild is indirectly used by osbuild-composer
3333
# but we'll mention it here too for better error messages and usability
3434
COMMON_SRC_DEPS_NAMES := osbuild osbuild-composer pulp-client community-gateway
35-
COMMON_SRC_DEPS_ORIGIN := $(addprefix $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR),$(COMMON_SRC_DEPS_NAMES))
35+
COMMON_SRC_DEPS_ORIGIN := $(addprefix $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)/,$(COMMON_SRC_DEPS_NAMES))
3636

3737
ONPREM_SRC_DEPS_NAMES := weldr-client
38-
ONPREM_SRC_DEPS_ORIGIN := $(addprefix $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR),$(ONPREM_SRC_DEPS_NAMES))
38+
ONPREM_SRC_DEPS_ORIGIN := $(addprefix $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)/,$(ONPREM_SRC_DEPS_NAMES))
3939

40-
SERVICE_SRC_DEPS_NAMES := image-builder image-builder-frontend
41-
SERVICE_SRC_DEPS_ORIGIN := $(addprefix $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR),$(SERVICE_SRC_DEPS_NAMES))
40+
SERVICE_SRC_DEPS_NAMES := image-builder-crc image-builder-frontend
41+
SERVICE_SRC_DEPS_ORIGIN := $(addprefix $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)/,$(SERVICE_SRC_DEPS_NAMES))
4242

4343
# should be set if we are already sudo - otherwise we set to "whoami"
4444
SUDO_USER ?= $(shell whoami)
4545

46-
$(COMMON_SRC_DEPS_ORIGIN) $(SERVICE_SRC_DEPS_ORIGIN) $(ONPREM_SRC_DEPS_ORIGIN):
47-
@for DIR in $@; do if ! [ -d $$DIR ]; then echo "Please checkout $$DIR so it is available at $$DIR"; exit 1; fi; done
46+
ALL_REQUIRED_DIRS := $(COMMON_SRC_DEPS_ORIGIN) $(SERVICE_SRC_DEPS_ORIGIN) $(ONPREM_SRC_DEPS_ORIGIN)
47+
48+
$(ALL_REQUIRED_DIRS):
49+
@if ! [ -d $@ ]; then \
50+
echo "Please checkout '$$(basename $@)' so it is available at $$(readlink -f $@)"; \
51+
echo "I expect a structure like this:"; \
52+
echo " $$(readlink -f $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR))"; \
53+
TOTAL=$$(echo $(ALL_REQUIRED_DIRS) | wc -w); \
54+
COUNT=1; \
55+
for REPO in $(ALL_REQUIRED_DIRS); do \
56+
if [ $$COUNT -eq $$TOTAL ]; then \
57+
PREFIX=" └──"; \
58+
else \
59+
PREFIX=" ├──"; \
60+
fi; \
61+
echo "$$PREFIX $$(basename $$REPO)"; \
62+
COUNT=$$((COUNT + 1)); \
63+
done; \
64+
exit 1; \
65+
fi;
4866

4967
COMPARE_TO_BRANCH ?= origin/main
5068

@@ -57,16 +75,14 @@ ALL_SCRATCH_DIRS := $(addprefix $(SCRATCH_DIR)/,$(COMMON_DIR) $(CLI_DIRS) $(DATA
5775

5876
OSBUILD_DIR ?= $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)/osbuild
5977
OSBUILD_COMPOSER_DIR ?= $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)/osbuild-composer
78+
IMAGE_BUILDER_CRC_DIR ?= $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)/image-builder-crc
79+
IMAGE_BUILDER_FRONTEND_DIR ?= $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)/image-builder-frontend
6080

6181
.PHONY: service_containers
62-
service_containers:
82+
service_containers: service_sub_make_backend
6383
make -C $(OSBUILD_DIR) -f $(GETTING_STARTED_DIR)/repos/osbuild/Makefile.getting-started container.dev
6484
make -C $(OSBUILD_COMPOSER_DIR) -f $(GETTING_STARTED_DIR)/repos/osbuild-composer/Makefile.getting-started container.dev
6585

66-
clean:
67-
make -C $(OSBUILD_DIR) -f $(GETTING_STARTED_DIR)/repos/osbuild/Makefile.getting-started clean.dev
68-
make -C $(OSBUILD_COMPOSER_DIR) -f $(GETTING_STARTED_DIR)/repos/osbuild-composer/Makefile.getting-started clean.dev
69-
7086
# internal rule for sub-calls
7187
# NOTE: This chowns all directories back - as we expect to run partly as root
7288
# also we "git fetch origin" to get the current state!
@@ -76,15 +92,17 @@ common_sub_makes:
7692
@echo "At least for podman the password as already needed now"
7793

7894
# creating container image from osbuild as a basis for worker
79-
$(MAKE_SUB_CALL) -C $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)osbuild-composer container_worker.dev container_composer.dev
95+
make -C $(OSBUILD_COMPOSER_DIR) -f $(GETTING_STARTED_DIR)/repos/osbuild-composer/Makefile.getting-started container.dev
8096

8197
.PHONY: service_sub_make_backend
8298
service_sub_make_backend:
83-
$(MAKE_SUB_CALL) -C $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)image-builder container.dev
99+
make -C $(OSBUILD_DIR) -f $(GETTING_STARTED_DIR)/repos/osbuild/Makefile.getting-started container.dev
100+
make -C $(OSBUILD_COMPOSER_DIR) -f $(GETTING_STARTED_DIR)/repos/osbuild-composer/Makefile.getting-started container.dev
101+
make -C $(IMAGE_BUILDER_CRC_DIR) -f $(GETTING_STARTED_DIR)/repos/image-builder-crc/Makefile.getting-started container.dev
84102

85103
.PHONY: service_sub_make_frontend
86104
service_sub_make_frontend:
87-
$(MAKE_SUB_CALL) -C $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)image-builder-frontend container.dev
105+
make -C $(IMAGE_BUILDER_CRC_DIR) -f $(GETTING_STARTED_DIR)/repos/image-builder-frontend/Makefile.getting-started container.dev
88106

89107
.PHONY: service_sub_make_cleanup
90108
service_sub_make_cleanup:
@@ -101,7 +119,7 @@ service_sub_makes: service_sub_make_backend service_sub_make_frontend service_su
101119
.PHONY: onprem_sub_makes
102120
onprem_sub_makes:
103121
# building the cli
104-
$(MAKE_SUB_CALL) -C $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)weldr-client container.dev
122+
$(MAKE_SUB_CALL) -C $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)/weldr-client container.dev
105123
@for DIR in $(COMMON_SRC_DEPS_ORIGIN) $(ONPREM_SRC_DEPS_ORIGIN); do echo "Giving directory permissions in '$$DIR' back to '$(SUDO_USER)'"; chown -R $(SUDO_USER): $$DIR || sudo chown -R $(SUDO_USER): $$DIR; done
106124
@echo "Your current versions are (comparing to origin/main):"
107125
bash -c './tools/git_stack.sh'
@@ -133,14 +151,17 @@ $(ALL_SCRATCH_DIRS):
133151
.PHONY: wipe_config
134152
wipe_config:
135153
sudo rm -rf $(SCRATCH_DIR)/$(COMMON_DIR)
136-
rm -f $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)image-builder-frontend/node_modules/.cache/webpack-dev-server/server.pem
154+
rm -f $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)/image-builder-frontend/node_modules/.cache/webpack-dev-server/server.pem
137155

138156
.PHONY: clean
139-
clean_old: prune_service prune_onprem wipe_config
157+
clean: prune_service prune_onprem wipe_config
140158
rm -f service_images_built.info
141159
rm -f onprem_images_built.info
142-
rm -rf $(SCRATCH_DIR) || (echo "Trying as root" ;sudo rm -rf $(SCRATCH_DIR))
143-
for DIR in $(COMMON_SRC_DEPS_ORIGIN) $(SERVICE_SRC_DEPS_ORIGIN) $(ONPREM_SRC_DEPS_ORIGIN); do $(MAKE_SUB_CALL) -C $$DIR clean; done
160+
rm -rf $(SCRATCH_DIR) 2>/dev/null || (echo "Trying as root" ;sudo rm -rf $(SCRATCH_DIR))
161+
make -C $(OSBUILD_DIR) -f $(GETTING_STARTED_DIR)/repos/osbuild/Makefile.getting-started clean.dev
162+
make -C $(OSBUILD_COMPOSER_DIR) -f $(GETTING_STARTED_DIR)/repos/osbuild-composer/Makefile.getting-started clean.dev
163+
make -C $(IMAGE_BUILDER_CRC_DIR) -f $(GETTING_STARTED_DIR)/repos/image-builder-crc/Makefile.getting-started clean.dev
164+
144165
$(CONTAINER_COMPOSE_EXECUTABLE) -f service/docker-compose.yml down --volumes
145166
$(CONTAINER_COMPOSE_EXECUTABLE) -f service/docker-compose.yml rm --volumes
146167
$(CONTAINER_COMPOSE_EXECUTABLE) -f service/docker-compose-onprem.yml down --volumes

‎repos/image-builder-crc/Makefile.getting-started‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
2+
GETTING_STARTED_DIR := $(patsubst %/,%,$(dir $(MAKEFILE_PATH))../../)
3+
SRC_DEPS_EXTERNAL_CHECKOUT_DIR ?= $(GETTING_STARTED_DIR)/..
4+
5+
IMAGE_BUILDER_CRC_DIR ?= $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)/image-builder-crc
6+
7+
.ONESHELL:
8+
SHELL := /bin/bash
9+
.SHELLFLAGS := -ec -o pipefail
10+
11+
include $(IMAGE_BUILDER_CRC_DIR)/Makefile
12+
13+
export CONTAINER_EXECUTABLE ?= podman
14+
15+
DOCKER_IMAGE := image-builder-crc_dev
16+
DOCKERFILE := $(GETTING_STARTED_DIR)/repos/image-builder-crc/tools/Dockerfile-ubi.dev
17+
18+
SRC_DEPS_EXTERNAL_NAMES := community-gateway osbuild-composer
19+
SRC_DEPS_EXTERNAL_DIRS := $(addprefix $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)/,$(SRC_DEPS_EXTERNAL_NAMES))
20+
21+
SRC_DEPS_NAMES := internal cmd
22+
SRC_DEPS_DIRS := $(addprefix $(IMAGE_BUILDER_CRC_DIR)/,$(SRC_DEPS_NAMES))
23+
24+
# All files to check for rebuild!
25+
SRC_DEPS := $(shell find $(SRC_DEPS_DIRS) -name *.go -or -name *.sql)
26+
SRC_DEPS_EXTERNAL := $(shell find $(SRC_DEPS_EXTERNAL_DIRS) -name *.go)
27+
28+
CONTAINER_DEPS := $(GETTING_STARTED_DIR)/repos/image-builder-crc/tools/openshift-startup.sh
29+
30+
$(SRC_DEPS_EXTERNAL_DIRS):
31+
@for DIR in $@; do if ! [ -d $$DIR ]; then echo "Please checkout $$DIR so it is available at $$DIR"; exit 1; fi; done
32+
33+
GOPROXY ?= https://proxy.golang.org,direct
34+
35+
GOMODARGS ?= -modfile=go.local.mod
36+
# gcflags "-N -l" for golang to allow debugging
37+
GCFLAGS ?= -gcflags=all=-N -gcflags=all=-l
38+
GOPATH ?= $(shell go env GOPATH)
39+
40+
go.local.mod go.local.sum: $(SRC_DEPS_EXTERNAL_DIRS) go.mod $(SRC_DEPS_EXTERNAL) $(SRC_DEPS)
41+
cp go.mod go.local.mod
42+
cp go.sum go.local.sum
43+
go mod edit $(GOMODARGS) -replace github.com/osbuild/osbuild-composer/pkg/splunk_logger=$(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)/osbuild-composer/pkg/splunk_logger
44+
go mod edit $(GOMODARGS) -replace github.com/osbuild/community-gateway=$(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)/community-gateway
45+
env GOPROXY=$(GOPROXY) go mod vendor $(GOMODARGS)
46+
47+
container_built.info: go.local.mod $(DOCKERFILE) $(CONTAINER_DEPS) $(SRC_DEPS)
48+
$(CONTAINER_EXECUTABLE) build \
49+
-t $(DOCKER_IMAGE) \
50+
-f $(DOCKERFILE) \
51+
--build-arg GOMODARGS="$(GOMODARGS)" \
52+
--build-arg GCFLAGS="$(GCFLAGS)" \
53+
$(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)
54+
echo "Container last built on" > $@
55+
date >> $@
56+
57+
.PHONY: container.dev
58+
container.dev: container_built.info
59+
60+
.PHONY: clean.dev
61+
clean.dev: clean
62+
rm -f container_built.info
63+
rm -f go.local.*

‎repos/image-builder-crc/tools/Dockerfile-ubi.dev‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Use a builder container to build the Go application (which we extract in
2+
# the second container).
3+
FROM registry.access.redhat.com/ubi9/go-toolset:latest AS builder
4+
5+
ARG IMAGE_BUILDER_CRC_DIR=image-builder-crc
6+
ENV IMAGE_BUILDER_CRC_DIR=$IMAGE_BUILDER_CRC_DIR
7+
8+
# ubi9/go-toolset defaults to uid 1001. Let's copy the files with this UID as well.
9+
# Otherwise, VCS stamping will fail because git >= 2.35.2 refuses to work in
10+
# a repository owned by a different user.
11+
COPY --chown=1001 ${IMAGE_BUILDER_CRC_DIR} .
12+
ENV GOFLAGS=-mod=vendor
13+
14+
ARG GOPROXY=https://proxy.golang.org,direct
15+
RUN go env -w GOPROXY=$GOPROXY
16+
17+
ARG GOMODARGS=""
18+
ARG GCFLAGS=""
19+
20+
RUN go install $GOMODARGS $GCFLAGS ./...
21+
22+
### builder2 stage
23+
FROM registry.access.redhat.com/ubi9/go-toolset:latest AS builder2
24+
RUN go install github.com/jackc/tern@latest
25+
26+
### final stage
27+
# Build an extremely minimal container that only contains our Go application.
28+
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
29+
30+
ARG IMAGE_BUILDER_CRC_DIR=image-builder-crc
31+
ENV IMAGE_BUILDER_CRC_DIR=$IMAGE_BUILDER_CRC_DIR
32+
33+
ARG GETTING_STARTED_DIR=osbuild-getting-started
34+
ENV GETTING_STARTED_DIR=$GETTING_STARTED_DIR
35+
36+
RUN mkdir /app
37+
RUN mkdir -p "/opt/migrate/"
38+
39+
COPY --from=builder /opt/app-root/src/go/bin/image-builder /app/
40+
COPY --from=builder /opt/app-root/src/go/bin/image-builder-migrate-db-tern /app/
41+
COPY ${IMAGE_BUILDER_CRC_DIR}/distributions /app/distributions
42+
COPY ${IMAGE_BUILDER_CRC_DIR}/internal/db/migrations-tern /app/migrations
43+
COPY ${GETTING_STARTED_DIR}/repos/image-builder-crc/tools/openshift-startup.sh /opt/openshift-startup.sh
44+
RUN chmod a+x /opt/openshift-startup.sh
45+
COPY --from=builder2 /opt/app-root/src/go/bin/tern /opt/migrate/
46+
COPY --from=builder2 /usr/bin/dlv /usr/bin/dlv
47+
COPY --from=builder2 /usr/share/licenses/delve /usr/share/licenses/delve
48+
ENV TERN_MIGRATIONS_DIR=/app/migrations
49+
EXPOSE 8086
50+
CMD ["/opt/openshift-startup.sh"]

‎repos/image-builder-crc/tools/openshift-startup.sh‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
4+
if [[ -z "${KUBERNETES_PORT:-}" ]]; then
5+
echo "Starting image-builder inside container..."
6+
if [[ -n "${GODEBUG_PORT:-}" ]]; then
7+
echo "With golang debugger enabled on port ${GODEBUG_PORT} ..."
8+
echo "NOTE: you HAVE to attach the debugger NOW otherwise the image-builder-backend will not continue running"
9+
/usr/bin/dlv "--listen=:${GODEBUG_PORT}" --headless=true --api-version=2 exec /app/image-builder -- -v
10+
exit $?
11+
fi
12+
# we don't use cloudwatch in ephemeral environment for now
13+
elif [[ "${CLOWDER_ENABLED:=false}" == "true" ]]; then
14+
echo "Starting image-builder inside ephemeral environment..."
15+
echo "Composer URL: ${COMPOSER_URL}"
16+
echo "Composer token URL: ${COMPOSER_TOKEN_URL}"
17+
echo "Distributions dir: ${DISTRIBUTIONS_DIR}"
18+
else
19+
echo "Starting image-builder inside OpenShift..."
20+
echo "Cloudwatch: ${CW_LOG_GROUP} in ${CW_AWS_REGION}"
21+
echo "Composer URL: ${COMPOSER_URL}"
22+
echo "Composer token URL: ${COMPOSER_TOKEN_URL}"
23+
echo "Distributions dir: ${DISTRIBUTIONS_DIR}"
24+
fi
25+
26+
/app/image-builder -v

‎repos/image-builder-frontend/Makefile.getting-started‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
2+
GETTING_STARTED_DIR := $(patsubst %/,%,$(dir $(MAKEFILE_PATH))../../)
3+
SRC_DEPS_EXTERNAL_CHECKOUT_DIR ?= $(GETTING_STARTED_DIR)/..
4+
5+
IMAGE_BUILDER_FRONTEND_DIR ?= $(SRC_DEPS_EXTERNAL_CHECKOUT_DIR)/image-builder-frontend
6+
7+
.ONESHELL:
8+
SHELL := /bin/bash
9+
.SHELLFLAGS := -ec -o pipefail
10+
11+
include $(IMAGE_BUILDER_FRONTEND_DIR)/Makefile
12+
13+
export CONTAINER_EXECUTABLE ?= podman
14+
15+
DOCKER_IMAGE := image-builder-frontend_dev
16+
DOCKERFILE := $(GETTING_STARTED_DIR)/repos/image-builder-frontend/tools/Dockerfile.dev
17+
18+
# All files to check for rebuild!
19+
SRC_DEPS := $(shell find $(IMAGE_BUILDER_FRONTEND_DIR) -not -path './node_modules/*' \
20+
-not -path './dist/*' \
21+
-not -path './coverage/*' \
22+
\( -name "*.ts" \
23+
-or -name "*.tsx" \
24+
-or -name "*.yml" \
25+
-or -name "*.yaml" \
26+
-or -name "*.json" \
27+
-or -name "*.js" \) )
28+
29+
clean.dev: clean
30+
rm -f container_built.info
31+
32+
container_built.info: $(DOCKERFILE) $(SRC_DEPS)
33+
$(CONTAINER_EXECUTABLE) build \
34+
-t $(DOCKER_IMAGE) \
35+
-f $(DOCKERFILE) \
36+
$(SRC_DEPS_EXTERNAL_CHECKOUT_DIR) \
37+
--build-arg BUILD_DATE=$(shell date +%Y%m%d_%H%M%S)
38+
echo "Container last built on" > $@
39+
date >> $@
40+
41+
.PHONY: container.dev
42+
container.dev: container_built.info ## build a container with the frontend

‎repos/image-builder-frontend/tools/Dockerfile.dev‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
FROM node:20
2+
3+
USER root
4+
# frontend-components need a container system
5+
# this is the reason why we run in docker -> to start podman then
6+
RUN apt update && apt install -y podman
7+
8+
WORKDIR /app
9+
10+
ARG IMAGE_BUILDER_FRONTEND_DIR=image-builder-frontend
11+
ENV IMAGE_BUILDER_FRONTEND_DIR=$IMAGE_BUILDER_FRONTEND_DIR
12+
13+
ARG GETTING_STARTED_DIR=osbuild-getting-started
14+
ENV GETTING_STARTED_DIR=$GETTING_STARTED_DIR
15+
16+
ARG BACKEND_HOSTNAME=localhost
17+
ENV BACKEND_HOSTNAME=$BACKEND_HOSTNAME
18+
19+
ARG BACKEND_PORT=8086
20+
ENV BACKEND_PORT=$BACKEND_PORT
21+
22+
COPY ${IMAGE_BUILDER_FRONTEND_DIR} .
23+
COPY ${GETTING_STARTED_DIR}/repos/image-builder-frontend/tools/create_storage_conf.sh /app/distribution/
24+
25+
26+
RUN chmod a+x /app/distribution/*.sh
27+
RUN /app/distribution/create_storage_conf.sh
28+
29+
# Helper to re-run npm ci
30+
ARG BUILD_DATE=NOT_SET
31+
ENV BUILD_DATE=$BUILD_DATE
32+
33+
RUN npm ci
34+
35+
EXPOSE 8002
36+
EXPOSE 1337
37+
38+
CMD [ "npm", "run", "start:local" ]

‎repos/image-builder-frontend/tools/create_storage_conf.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
3+
mkdir -p /etc/containers
4+
5+
tee -a /etc/containers/storage.conf <<EOF
6+
[storage]
7+
driver = "vfs"
8+
runroot = "/run/containers/storage"
9+
graphroot = "/var/lib/containers/storage"
10+
EOF

0 commit comments

Comments
 (0)