Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove buildah references #2822

Merged
merged 1 commit into from
Nov 7, 2022
Merged
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
20 changes: 0 additions & 20 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ CHARTS_INTEGRATION := wire-server databases-ephemeral redis-cluster fake-aws
# this list could be generated from the folder names under ./charts/ like so:
# CHARTS_RELEASE := $(shell find charts/ -maxdepth 1 -type d | xargs -n 1 basename | grep -v charts)
CHARTS_RELEASE := wire-server redis-ephemeral redis-cluster databases-ephemeral fake-aws fake-aws-s3 fake-aws-sqs aws-ingress fluent-bit kibana backoffice calling-test demo-smtp elasticsearch-curator elasticsearch-external elasticsearch-ephemeral minio-external cassandra-external nginx-ingress-controller nginx-ingress-services reaper sftd restund coturn inbucket
BUILDAH_PUSH ?= 0
KIND_CLUSTER_NAME := wire-server
BUILDAH_KIND_LOAD ?= 1

package ?= all
EXE_SCHEMA := ./dist/$(package)-schema
Expand Down Expand Up @@ -409,24 +407,6 @@ upload-charts: charts-release
echo-release-charts:
@echo ${CHARTS_RELEASE}

.PHONY: buildah-docker
buildah-docker: buildah-docker-nginz
./hack/bin/buildah-compile.sh all
BUILDAH_PUSH=${BUILDAH_PUSH} KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME} BUILDAH_KIND_LOAD=${BUILDAH_KIND_LOAD} ./hack/bin/buildah-make-images.sh

.PHONY: buildah-docker-nginz
buildah-docker-nginz:
BUILDAH_PUSH=${BUILDAH_PUSH} KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME} BUILDAH_KIND_LOAD=${BUILDAH_KIND_LOAD} ./hack/bin/buildah-make-images-nginz.sh

.PHONY: buildah-docker-%
buildah-docker-%:
./hack/bin/buildah-compile.sh $(*)
BUILDAH_PUSH=${BUILDAH_PUSH} EXECUTABLES=$(*) KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME} BUILDAH_KIND_LOAD=${BUILDAH_KIND_LOAD} ./hack/bin/buildah-make-images.sh

.PHONY: buildah-clean
buildah-clean:
./hack/bin/buildah-clean.sh

.PHONY: kind-cluster
kind-cluster:
kind create cluster --name $(KIND_CLUSTER_NAME)
Expand Down
1 change: 1 addition & 0 deletions changelog.d/5-internal/buildah-drop-support
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove support for compiling local docker images with buildah. Nix is used to build docker images these days
6 changes: 0 additions & 6 deletions docs/src/developer/developer/dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,6 @@ Requirements:

In both cases, you need to adjust the various integration configuration files and names so that this can work.

## Buildah (optional)

[Buildah](https://buildah.io/) is used for local docker image creation during development. See [buildah installation](https://github.com/containers/buildah/blob/master/install.md)

See `make buildah-docker` for an entry point here.

## Helm chart development, integration tests in kubernetes

You need `kubectl`, `helm`, `helmfile`, and a valid kubernetes context. Refer to https://docs.wire.com for details.
13 changes: 5 additions & 8 deletions docs/src/developer/developer/how-to.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ FUTUREWORK: this process is in development (update this section after it's confi

##### (i) Build images

1. Ensure `buildah` is available on your system.
2. Compile the image using `make buildah-docker`. This will try to upload the
images into a `kind` cluster. If you'd prefer uploading images to quay.io,
you can run it with `make buildah-docker BUILDAH_PUSH=1 BUILDAH_KIND_LOAD=0`
(FUTUREWORK: implement a convenient shortcut to build images without actually uploading them also)
```
make upload-images-dev
```

##### (ii) Run tests in kind

Expand All @@ -120,7 +120,6 @@ FUTUREWORK: this process is in development (update this section after it's confi
2. Run tests using `make kind-integration-test`.
3. Run end2end integration tests: `make kind-integration-e2e`.

NOTE: debug this process further as some images (e.g. nginz) are missing from the default buildah steps.
* Implement re-tagging development tags as your user tag?

#### 2.4 Deploy your local code to a kubernetes cluster
Expand All @@ -138,9 +137,7 @@ make kube-integration-setup
Then build and push the `brig` image by running

```
export DOCKER_TAG_LOCAL_BUILD=$USER
hack/bin/buildah-compile.sh all
DOCKER_TAG=$DOCKER_TAG_LOCAL_BUILD EXECUTABLES=brig BUILDAH_PUSH=1 ./hack/bin/buildah-make-images.sh
#FUTUREWORK
```

To update the release with brig's local image run
Expand Down
9 changes: 0 additions & 9 deletions hack/bin/buildah-clean.sh

This file was deleted.

30 changes: 0 additions & 30 deletions hack/bin/buildah-compile.sh

This file was deleted.

16 changes: 0 additions & 16 deletions hack/bin/buildah-inside.sh

This file was deleted.

37 changes: 0 additions & 37 deletions hack/bin/buildah-make-images-nginz.sh

This file was deleted.

51 changes: 0 additions & 51 deletions hack/bin/buildah-make-images.sh

This file was deleted.

6 changes: 0 additions & 6 deletions hack/bin/buildah-purge-untagged.sh

This file was deleted.