diff --git a/.cloudbuild/dev.yaml b/.cloudbuild/dev.yaml index 0a8919477..8af553094 100644 --- a/.cloudbuild/dev.yaml +++ b/.cloudbuild/dev.yaml @@ -1,6 +1,6 @@ steps: - name: gcr.io/cloud-builders/docker - args: ['build', '-t', 'gcr.io/$PROJECT_ID/dendrite-monolith:$COMMIT_SHA', '-f', 'build/docker/Dockerfile.monolith', '.'] + args: ['build', '-t', 'gcr.io/$PROJECT_ID/dendrite-monolith:$COMMIT_SHA', '-f', 'Dockerfile', '.'] - name: gcr.io/cloud-builders/kubectl args: ['-n', 'dendrite', 'set', 'image', 'deployment/dendrite', 'dendrite=gcr.io/$PROJECT_ID/dendrite-monolith:$COMMIT_SHA'] env: diff --git a/.cloudbuild/prod.yaml b/.cloudbuild/prod.yaml index 145d86752..68f67b858 100644 --- a/.cloudbuild/prod.yaml +++ b/.cloudbuild/prod.yaml @@ -1,6 +1,6 @@ steps: - name: gcr.io/cloud-builders/docker - args: ['build', '-t', 'gcr.io/$PROJECT_ID/dendrite-monolith:$TAG_NAME', '-f', 'build/docker/Dockerfile.monolith', '.'] + args: ['build', '-t', 'gcr.io/$PROJECT_ID/dendrite-monolith:$TAG_NAME', '-f', 'Dockerfile', '.'] - name: gcr.io/cloud-builders/kubectl args: ['set', 'image', 'deployment/dendrite', 'dendrite=gcr.io/$PROJECT_ID/dendrite-monolith:$TAG_NAME'] env: diff --git a/Dockerfile b/Dockerfile index 499992343..9037055e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,19 +35,6 @@ LABEL org.opencontainers.image.vendor="The Matrix.org Foundation C.I.C." RUN addgroup dendrite && adduser dendrite -G dendrite -u 1337 -D USER dendrite -# -# Builds the polylith image and only contains the polylith binary -# -FROM dendrite-base AS polylith -LABEL org.opencontainers.image.title="Dendrite (Polylith)" - -COPY --from=build /out/dendrite-polylith-multi /usr/bin/ - -VOLUME /etc/dendrite -WORKDIR /etc/dendrite - -ENTRYPOINT ["/usr/bin/dendrite-polylith-multi"] - # # Builds the monolith image and contains all required binaries #