Skip to content

Commit 363f216

Browse files
SupremeMortalSupremeMortal
committed
[gitops] Fix build script and submodule
1 parent 2cbd800 commit 363f216

File tree

2 files changed

+40
-42
lines changed

2 files changed

+40
-42
lines changed

‎gitops/build.sh‎

Lines changed: 39 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#!/bin/bash
22

3-
DATE="2026-02-07-151505"
4-
53
source version.sh
64
source ../common.sh
75

@@ -45,48 +43,48 @@ CI_DEX_COMMIT="$(git -C sources/dex rev-parse HEAD)"
4543
CI_GITOPS_BACKEND_COMMIT="$(git -C sources/gitops-backend rev-parse HEAD)"
4644

4745
# CLI images
48-
#podman build -t "${IMG_CLI}" -f clis/argocd/Dockerfile \
49-
# --build-arg CI_ARGO_CD_VERSION="${CI_ARGO_CD_VERSION}" --build-arg CI_ARGO_CD_COMMIT="${CI_ARGO_CD_COMMIT}" \
50-
# --build-arg CI_VERSION="${OCP_DATE}" .
51-
#podman build -t "${IMG_AGENTCTL}" -f clis/argocd-agentctl/Dockerfile .
46+
podman build -t "${IMG_CLI}" -f clis/argocd/Dockerfile \
47+
--build-arg CI_ARGO_CD_VERSION="${CI_ARGO_CD_VERSION}" --build-arg CI_ARGO_CD_COMMIT="${CI_ARGO_CD_COMMIT}" \
48+
--build-arg CI_VERSION="${OCP_DATE}" .
49+
podman build -t "${IMG_AGENTCTL}" -f clis/argocd-agentctl/Dockerfile .
5250

5351

5452
# Build the images
55-
#podman build -t "${IMG_ROLLOUTS}" -f containers/argo-rollouts/Dockerfile \
56-
# --build-arg CI_ARGO_ROLLOUTS_VERSION="${CI_ARGO_ROLLOUTS_VERSION}" \
57-
# --build-arg CI_ARGO_ROLLOUTS_COMMIT="${CI_ARGO_ROLLOUTS_COMMIT}" --build-arg CI_GIT_LFS_COMMIT="${CI_GIT_LFS_COMMIT}" .
58-
#podman build -t ${IMG_AGENT} -f containers/argocd-agent/Dockerfile .
59-
#podman build -t ${IMG_EXTENSIONS} -f containers/argocd-extensions/Dockerfile .
60-
#podman build -t ${IMG_IMAGE_UPDATER} -f containers/argocd-image-updater/Dockerfile \
61-
# --build-arg CI_ARGOCD_IMAGE_UPDATER_VERSION="${CI_ARGOCD_IMAGE_UPDATER_VERSION}" \
62-
# --build-arg CI_ARGOCD_IMAGE_UPDATER_COMMIT="${CI_ARGOCD_IMAGE_UPDATER_COMMIT}" .
63-
#podman build -t ${IMG_ARGOCD} -f containers/argocd-rhel9/Dockerfile \
64-
# --build-arg CI_ARGO_CD_VERSION="${CI_ARGO_CD_VERSION}" --build-arg CI_ARGO_CD_COMMIT="${CI_ARGO_CD_COMMIT}" \
65-
# --build-arg CI_GIT_LFS_COMMIT="${CI_GIT_LFS_COMMIT}" --build-arg ARGO_VERSION="${CI_ARGO_CD_VERSION}" \
66-
# --build-arg CI_VERSION="${OCP_DATE}" --build-arg BUILD_ALL_CLIS=false \
67-
# --build-arg CI_KUSTOMIZE_VERSION="${CI_KUSTOMIZE_VERSION}" --build-arg CI_HELM_VERSION="${CI_HELM_VERSION}" \
68-
# --build-arg CI_HELM_COMMIT="${CI_HELM_COMMIT}" --build-arg CI_GIT_LFS_COMMIT="${CI_GIT_LFS_COMMIT}" .
69-
#podman build -t ${IMG_CONSOLE_PLUGIN} -f containers/console-plugin/Dockerfile .
70-
#podman build -t ${IMG_DEX} -f containers/dex/Dockerfile \
71-
# --build-arg CI_DEX_VERSION="${CI_DEX_VERSION}" --build-arg CI_DEX_COMMIT="${CI_DEX_COMMIT}" .
72-
#podman build -t ${IMG_BACKEND} -f containers/gitops/Dockerfile \
73-
# --build-arg CI_GITOPS_BACKEND_COMMIT="${CI_GITOPS_BACKEND_COMMIT}" .
74-
#podman build -t ${IMG_OPERATOR} -f containers/gitops-operator/Dockerfile .
75-
#podman build -t ${IMG_MUST_GATHER} --from "$(get_payload_component "must-gather")" -f containers/must-gather/Dockerfile .
76-
77-
# Push the images
78-
#podman push ${IMG_CLI}
79-
#podman push ${IMG_AGENTCTL}
80-
#podman push ${IMG_ROLLOUTS}
81-
#podman push ${IMG_AGENT}
82-
#podman push ${IMG_EXTENSIONS}
83-
#podman push ${IMG_IMAGE_UPDATER}
84-
#podman push ${IMG_ARGOCD}
85-
#podman push ${IMG_CONSOLE_PLUGIN}
86-
#podman push ${IMG_DEX}
87-
#podman push ${IMG_BACKEND}
88-
#podman push ${IMG_OPERATOR}
89-
#podman push ${IMG_MUST_GATHER}
53+
podman build -t "${IMG_ROLLOUTS}" -f containers/argo-rollouts/Dockerfile \
54+
--build-arg CI_ARGO_ROLLOUTS_VERSION="${CI_ARGO_ROLLOUTS_VERSION}" \
55+
--build-arg CI_ARGO_ROLLOUTS_COMMIT="${CI_ARGO_ROLLOUTS_COMMIT}" --build-arg CI_GIT_LFS_COMMIT="${CI_GIT_LFS_COMMIT}" .
56+
podman build -t ${IMG_AGENT} -f containers/argocd-agent/Dockerfile .
57+
podman build -t ${IMG_EXTENSIONS} -f containers/argocd-extensions/Dockerfile .
58+
podman build -t ${IMG_IMAGE_UPDATER} -f containers/argocd-image-updater/Dockerfile \
59+
--build-arg CI_ARGOCD_IMAGE_UPDATER_VERSION="${CI_ARGOCD_IMAGE_UPDATER_VERSION}" \
60+
--build-arg CI_ARGOCD_IMAGE_UPDATER_COMMIT="${CI_ARGOCD_IMAGE_UPDATER_COMMIT}" .
61+
podman build -t ${IMG_ARGOCD} -f containers/argocd-rhel9/Dockerfile \
62+
--build-arg CI_ARGO_CD_VERSION="${CI_ARGO_CD_VERSION}" --build-arg CI_ARGO_CD_COMMIT="${CI_ARGO_CD_COMMIT}" \
63+
--build-arg CI_GIT_LFS_COMMIT="${CI_GIT_LFS_COMMIT}" --build-arg ARGO_VERSION="${CI_ARGO_CD_VERSION}" \
64+
--build-arg CI_VERSION="${OCP_DATE}" --build-arg BUILD_ALL_CLIS=false \
65+
--build-arg CI_KUSTOMIZE_VERSION="${CI_KUSTOMIZE_VERSION}" --build-arg CI_HELM_VERSION="${CI_HELM_VERSION}" \
66+
--build-arg CI_HELM_COMMIT="${CI_HELM_COMMIT}" --build-arg CI_GIT_LFS_COMMIT="${CI_GIT_LFS_COMMIT}" .
67+
podman build -t ${IMG_CONSOLE_PLUGIN} -f containers/console-plugin/Dockerfile .
68+
podman build -t ${IMG_DEX} -f containers/dex/Dockerfile \
69+
--build-arg CI_DEX_VERSION="${CI_DEX_VERSION}" --build-arg CI_DEX_COMMIT="${CI_DEX_COMMIT}" .
70+
podman build -t ${IMG_BACKEND} -f containers/gitops/Dockerfile \
71+
--build-arg CI_GITOPS_BACKEND_COMMIT="${CI_GITOPS_BACKEND_COMMIT}" .
72+
podman build -t ${IMG_OPERATOR} -f containers/gitops-operator/Dockerfile .
73+
podman build -t ${IMG_MUST_GATHER} --from "$(get_payload_component "must-gather")" -f containers/must-gather/Dockerfile .
74+
75+
Push the images
76+
podman push ${IMG_CLI}
77+
podman push ${IMG_AGENTCTL}
78+
podman push ${IMG_ROLLOUTS}
79+
podman push ${IMG_AGENT}
80+
podman push ${IMG_EXTENSIONS}
81+
podman push ${IMG_IMAGE_UPDATER}
82+
podman push ${IMG_ARGOCD}
83+
podman push ${IMG_CONSOLE_PLUGIN}
84+
podman push ${IMG_DEX}
85+
podman push ${IMG_BACKEND}
86+
podman push ${IMG_OPERATOR}
87+
podman push ${IMG_MUST_GATHER}
9088

9189
# Envsubst env-override.yaml
9290
export ENV_OVERRIDES="$(envsubst < $DIR/env-override.yaml)"

‎gitops/release‎

0 commit comments

Comments
 (0)