Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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
8 changes: 2 additions & 6 deletions .github/workflows/dockerfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,35 +105,31 @@ jobs:
--lint-conf lintconf.yaml

- name: Create kind cluster
if: steps.list-changed.outputs.changed == 'true'
uses: helm/kind-action@v1

- name: Log in to GHCR
if: steps.list-changed.outputs.changed == 'true'
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Load image into kind
if: steps.list-changed.outputs.changed == 'true'
run: |
docker pull ghcr.io/${{ github.repository }}:pr-${{ github.event.pull_request.number }}
kind load docker-image ghcr.io/${{ github.repository }}:pr-${{ github.event.pull_request.number }} --name chart-testing

- name: Run chart-testing (install)
id: chart-testing-install
if: steps.list-changed.outputs.changed == 'true'
run: |
ct install --github-groups \
--chart-dirs kubernetes/chart \
--target-branch ${{ github.event.repository.default_branch }} \
--all \
--helm-extra-set-args "--set image.tag=pr-${{ github.event.pull_request.number }}" \
--skip-clean-up

- name: Fetch logs
if: steps.list-changed.outputs.changed == 'true' && ( success() || failure() )
if: success() || failure()
continue-on-error: true
run: |
namespace=$(helm list --all-namespaces --output json \
Expand Down
4 changes: 0 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ RUN git clone "$ZULIP_GIT_URL" -b "$ZULIP_GIT_REF"

WORKDIR /home/zulip/zulip

ARG CUSTOM_CA_CERTIFICATES

# Finally, we provision the development environment and build a release tarball
RUN SKIP_VENV_SHELL_WARNING=1 ./tools/provision --build-release-tarball-only && \
uv run --no-sync ./tools/build-release-tarball docker && \
Expand All @@ -51,8 +49,6 @@ ENV DATA_DIR="/data"
COPY --from=build /tmp/zulip-server-docker.tar.gz /root/
COPY custom_zulip_files/ /root/custom_zulip

ARG CUSTOM_CA_CERTIFICATES

WORKDIR /root
RUN \
# Make sure Nginx is started by Supervisor.
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ services:
## Change these if you want to build zulip from a different repo/branch
ZULIP_GIT_URL: https://github.com/zulip/zulip.git
ZULIP_GIT_REF: "11.4"
## Set this up if you plan to use your own CA certificate bundle for building
# CUSTOM_CA_CERTIFICATES:
ports:
- "25:25"
- "80:80"
Expand Down
Loading