Skip to content

Commit

Permalink
chore: remove docker directory (#991)
Browse files Browse the repository at this point in the history
Signed-off-by: Jeffrey Tang <[email protected]>
  • Loading branch information
JeffreyDallas authored Oct 10, 2024
1 parent d19f6cf commit 83fed7b
Show file tree
Hide file tree
Showing 22 changed files with 14 additions and 765 deletions.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

/build-logic/** @hashgraph/release-engineering @hashgraph/release-engineering-managers @hashgraph/devops-ci
/charts/** @hashgraph/release-engineering @hashgraph/release-engineering-managers @hashgraph/devops-ci
/docker/** @hashgraph/release-engineering @hashgraph/release-engineering-managers @hashgraph/devops-ci
/fullstack-core/** @hashgraph/release-engineering
/fullstack-examples/** @hashgraph/release-engineering
/fullstack-gradle-plugin/** @hashgraph/release-engineering @hashgraph/devops-ci
Expand Down
5 changes: 0 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,3 @@ updates:
schedule:
interval: "daily"
open-pull-requests-limit: 15
- package-ecosystem: "docker"
directory: "/docker"
schedule:
interval: "daily"
open-pull-requests-limit: 5
55 changes: 0 additions & 55 deletions .github/workflows/flow-deploy-release-artifact.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,60 +115,6 @@ jobs:
ossrh-user-name: ${{ secrets.OSSRH_USER_NAME }}
ossrh-user-password: ${{ secrets.OSSRH_USER_PASSWORD }}

publish-docker-image:
name: Publish / Docker Image
runs-on: solo-linux-medium
needs:
- prepare-release
steps:
- name: Checkout repository
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

- name: Login to GitHub Container Registry
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Docker Qemu
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@8026d2bc3645ea78b0d2544766a1225eb5691f89 # v3.7.0

- name: Build Docker Image (ubi8-init-dind)
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
context: docker/ubi8-init-dind
platforms: linux/amd64, linux/arm64
push: ${{ github.event.inputs.dry-run-enabled != 'true' }}
tags: ghcr.io/${{ github.repository }}/ubi8-init-dind:${{ needs.prepare-release.outputs.version }}

- name: Build Docker Image (ubi8-init-java17)
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
context: docker/ubi8-init-java17
platforms: linux/amd64, linux/arm64
push: ${{ github.event.inputs.dry-run-enabled != 'true' }}
tags: ghcr.io/${{ github.repository }}/ubi8-init-java17:${{ needs.prepare-release.outputs.version }}

- name: Build Docker Image (ubi8-init-java21)
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
context: docker/ubi8-init-java21
platforms: linux/amd64, linux/arm64
push: ${{ github.event.inputs.dry-run-enabled != 'true' }}
tags: ghcr.io/${{ github.repository }}/ubi8-init-java21:${{ needs.prepare-release.outputs.version }}

- name: Build Docker Image (kubectl-bats)
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
with:
context: docker/kubectl-bats
platforms: linux/amd64, linux/arm64
push: ${{ github.event.inputs.dry-run-enabled != 'true' }}
tags: ghcr.io/${{ github.repository }}/kubectl-bats:${{ needs.prepare-release.outputs.version }}

publish-helm-charts:
name: Publish / Helm Charts
runs-on: solo-linux-medium
Expand Down Expand Up @@ -212,7 +158,6 @@ jobs:
runs-on: solo-linux-medium
needs:
- publish-maven-central
- publish-docker-image
- publish-helm-charts
steps:
- name: Checkout Code
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/support/ci/ci-values.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# helm test container
tester:
image:
registry: "docker.fst.local"
repository: "kubectl-bats"
tag: "local"
pullPolicy: "Never"
registry: "ghcr.io"
repository: "hashgraph/solo-containers/kubectl-bats"
tag: "0.33.0"
pullPolicy: "IfNotPresent"
resources: {}
12 changes: 2 additions & 10 deletions .github/workflows/support/ci_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@ kubectl config use-context "kind-${CLUSTER_NAME}"
kubectl config set-context --current --namespace="${NAMESPACE}"
kubectl config get-contexts

echo "-----------------------------------------------------------------------------------------------------"
echo "Building kubectl-bats image"
KUBECTL_BATS_IMAGE="${LOCAL_DOCKER_REGISTRY}/kubectl-bats:${LOCAL_DOCKER_IMAGE_TAG}"
cd "${DOCKERFILE_DIR}/kubectl-bats" && docker build -t "${KUBECTL_BATS_IMAGE}" .
kind load docker-image "${KUBECTL_BATS_IMAGE}" -n "${CLUSTER_NAME}"
cd -


echo "-----------------------------------------------------------------------------------------------------"
echo "Helm dependency update"

Expand Down Expand Up @@ -57,9 +49,9 @@ echo "Additional values: ${CHART_VALUES_FILES}"
echo "-----------------------------------------------------------------------------------------------------"
if [ "${SCRIPT_NAME}" = "nmt-install.sh" ]; then
if [[ -z "${CHART_VALUES_FILES}" ]]; then
helm install "${RELEASE_NAME}" -n "${NAMESPACE}" "${CHART_DIR}" --set defaults.root.image.repository=hashgraph/full-stack-testing/ubi8-init-dind
helm install "${RELEASE_NAME}" -n "${NAMESPACE}" "${CHART_DIR}" --set defaults.root.image.repository=hashgraph/solo-containers/ubi8-init-dind
else
helm install "${RELEASE_NAME}" -n "${NAMESPACE}" "${CHART_DIR}" -f "${CHART_DIR}/values.yaml" --values "${CHART_VALUES_FILES}" --set defaults.root.image.repository=hashgraph/full-stack-testing/ubi8-init-dind
helm install "${RELEASE_NAME}" -n "${NAMESPACE}" "${CHART_DIR}" -f "${CHART_DIR}/values.yaml" --values "${CHART_VALUES_FILES}" --set defaults.root.image.repository=hashgraph/solo-containers/ubi8-init-dind
fi
else
if [[ -z "${CHART_VALUES_FILES}" ]]; then
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/support/scripts/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,4 @@ readonly CHART_DIR="../../../charts/fullstack-deployment"
# telemetry related env variables
readonly TELEMETRY_DIR="${SCRIPT_DIR}/../telemetry"

# docker build related env variables
readonly DOCKERFILE_DIR="../../../docker"
readonly LOCAL_DOCKER_REGISTRY="docker.fst.local" # same as in dev/ci/ci-values.yaml
readonly LOCAL_DOCKER_IMAGE_TAG="local"

show_env_vars
6 changes: 3 additions & 3 deletions charts/fullstack-deployment/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies:
version: 0.2.0
- name: hedera-mirror
repository: https://hashgraph.github.io/hedera-mirror-node/charts
version: 0.111.1
version: 0.113.0
- name: tenant
repository: https://operator.min.io/
version: 5.0.12
Expand All @@ -14,5 +14,5 @@ dependencies:
- name: haproxy-ingress
repository: https://haproxy-ingress.github.io/charts
version: 0.14.5
digest: sha256:ca8cade42bbfa3211fde7112cb0998e8c7c86587c9113b10f2cbd209683113b0
generated: "2024-09-06T10:44:29.620625+01:00"
digest: sha256:cb2c36ef5124512badb4dbf8640905d06b6fdcca1d42a0e30f0136b36baaaec2
generated: "2024-10-09T12:17:54.672614-05:00"
8 changes: 4 additions & 4 deletions charts/fullstack-deployment/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ tester:
clusterRoleName: "pod-monitor-role" # this is a shared cluster role for all namespaces
image:
registry: "ghcr.io"
repository: "hashgraph/full-stack-testing/kubectl-bats"
tag: "" # this should be empty since we want the default behavior of $.Chart.appVersion to apply
repository: "hashgraph/solo-containers/kubectl-bats"
tag: "0.33.0"
pullPolicy: "IfNotPresent"
resources: {}

Expand Down Expand Up @@ -67,8 +67,8 @@ defaults:
root: # root container
image:
registry: "ghcr.io"
repository: "hashgraph/full-stack-testing/ubi8-init-java21"
tag: "" # this should be empty since we want the default behavior of $.Chart.appVersion to apply
repository: "hashgraph/solo-containers/ubi8-init-java21"
tag: "0.33.0"
pullPolicy: "IfNotPresent"
resources: {}
extraEnv: []
Expand Down
35 changes: 0 additions & 35 deletions docker/kubectl-bats/Dockerfile

This file was deleted.

36 changes: 0 additions & 36 deletions docker/kubectl-bats/build.gradle.kts

This file was deleted.

48 changes: 0 additions & 48 deletions docker/ubi8-init-dind/Dockerfile

This file was deleted.

36 changes: 0 additions & 36 deletions docker/ubi8-init-dind/build.gradle.kts

This file was deleted.

Loading

0 comments on commit 83fed7b

Please sign in to comment.