mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-12 02:54:20 +00:00
56b527060b
* show app redirect issues, action layout * refactor pagination * tos, privacy * new paginator everywhere * layout width and table optim * lint pt1 * lint config, ts * stylelint * chore(deps-dev): bump @angular/cli from 11.2.7 to 11.2.8 in /console (#1566) * fix: remove app name check on ChangeAPIApplication (#1561) * fix: remove app name check on ChangeAPIApplication * fix APIConfigInvalid message * chore(workflow): ignore tags for docs and codecov flows (#1564) * chore(deps-dev): bump @angular/cli from 11.2.7 to 11.2.8 in /console Bumps [@angular/cli](https://github.com/angular/angular-cli) from 11.2.7 to 11.2.8. - [Release notes](https://github.com/angular/angular-cli/releases) - [Commits](https://github.com/angular/angular-cli/compare/v11.2.7...v11.2.8) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump jasmine-spec-reporter from 6.0.0 to 7.0.0 in /console (#1573) * fix: remove app name check on ChangeAPIApplication (#1561) * fix: remove app name check on ChangeAPIApplication * fix APIConfigInvalid message * chore(workflow): ignore tags for docs and codecov flows (#1564) * chore(deps-dev): bump jasmine-spec-reporter in /console Bumps [jasmine-spec-reporter](https://github.com/bcaudan/jasmine-spec-reporter) from 6.0.0 to 7.0.0. - [Release notes](https://github.com/bcaudan/jasmine-spec-reporter/releases) - [Changelog](https://github.com/bcaudan/jasmine-spec-reporter/blob/master/CHANGELOG.md) - [Commits](https://github.com/bcaudan/jasmine-spec-reporter/compare/v6.0.0...v7.0.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump @angular-devkit/build-angular from 0.1102.7 to 0.1102.8 in /console (#1574) * fix: remove app name check on ChangeAPIApplication (#1561) * fix: remove app name check on ChangeAPIApplication * fix APIConfigInvalid message * chore(workflow): ignore tags for docs and codecov flows (#1564) * chore(deps-dev): bump @angular-devkit/build-angular in /console Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 0.1102.7 to 0.1102.8. - [Release notes](https://github.com/angular/angular-cli/releases) - [Commits](https://github.com/angular/angular-cli/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Max Peintner <max@caos.ch> * chore(deps): bump @types/file-saver from 2.0.1 to 2.0.2 in /console (#1576) * fix: remove app name check on ChangeAPIApplication (#1561) * fix: remove app name check on ChangeAPIApplication * fix APIConfigInvalid message * chore(workflow): ignore tags for docs and codecov flows (#1564) * chore(deps): bump @types/file-saver from 2.0.1 to 2.0.2 in /console Bumps [@types/file-saver](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/file-saver) from 2.0.1 to 2.0.2. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/file-saver) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump @angular/language-service from 11.2.8 to 11.2.9 in /console (#1567) * fix: remove app name check on ChangeAPIApplication (#1561) * fix: remove app name check on ChangeAPIApplication * fix APIConfigInvalid message * chore(workflow): ignore tags for docs and codecov flows (#1564) * chore(deps-dev): bump @angular/language-service in /console Bumps [@angular/language-service](https://github.com/angular/angular/tree/HEAD/packages/language-service) from 11.2.8 to 11.2.9. - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/11.2.9/packages/language-service) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update protobuf, libphone * chore(deps): bump rxjs from 6.6.3 to 6.6.7 in /console (#1488) Bumps [rxjs](https://github.com/reactivex/rxjs) from 6.6.3 to 6.6.7. - [Release notes](https://github.com/reactivex/rxjs/releases) - [Changelog](https://github.com/ReactiveX/rxjs/blob/6.6.7/CHANGELOG.md) - [Commits](https://github.com/reactivex/rxjs/compare/6.6.3...6.6.7) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump @types/jasmine from 3.6.3 to 3.6.9 in /console (#1485) Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 3.6.3 to 3.6.9. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Max Peintner <max@caos.ch> * chore(deps-dev): bump jasmine-core from 3.6.0 to 3.7.1 in /console (#1445) Bumps [jasmine-core](https://github.com/jasmine/jasmine) from 3.6.0 to 3.7.1. - [Release notes](https://github.com/jasmine/jasmine/releases) - [Changelog](https://github.com/jasmine/jasmine/blob/main/RELEASE.md) - [Commits](https://github.com/jasmine/jasmine/compare/v3.6.0...v3.7.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com>
193 lines
6.4 KiB
Plaintext
193 lines
6.4 KiB
Plaintext
ARG GO_VERSION=1.15.8
|
|
ARG NODE_VERSION=15.8.0
|
|
ARG ENV=prod
|
|
|
|
#######################
|
|
## These steps set platform / arch type specific variables
|
|
#######################
|
|
FROM alpine AS arm64-base
|
|
ENV PROTOC_ARCH aarch_64
|
|
|
|
FROM alpine AS amd64-base
|
|
ENV PROTOC_ARCH x86_64
|
|
|
|
#######################
|
|
## This step sets up the folder structure,
|
|
## initalices go mods,
|
|
## downloads the protofiles,
|
|
## protoc and protoc-gen-grpc-web for later use
|
|
#######################
|
|
FROM ${BUILDARCH}-base AS base
|
|
ARG PROTOC_VERSION=3.13.0
|
|
ARG PROTOC_ZIP=protoc-${PROTOC_VERSION}-linux-${PROTOC_ARCH}.zip
|
|
ARG GRPC_WEB_VERSION=1.2.1
|
|
# no arm specific version available and x86 works fine at the moment:
|
|
ARG GRPC_WEB=protoc-gen-grpc-web-${GRPC_WEB_VERSION}-linux-x86_64
|
|
|
|
|
|
RUN apk add tar curl
|
|
WORKDIR /proto
|
|
|
|
#protoc
|
|
RUN curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/$PROTOC_ZIP \
|
|
&& unzip -o $PROTOC_ZIP -d /usr/local bin/protoc \
|
|
&& unzip -o $PROTOC_ZIP -d /proto include/* \
|
|
&& rm -f $PROTOC_ZIP
|
|
|
|
#grpc web
|
|
RUN curl -OL https://github.com/grpc/grpc-web/releases/download/${GRPC_WEB_VERSION}/${GRPC_WEB} \
|
|
&& mv ${GRPC_WEB} /usr/local/bin/protoc-gen-grpc-web \
|
|
&& chmod +x /usr/local/bin/protoc-gen-grpc-web
|
|
|
|
#proto dependencies
|
|
RUN curl https://raw.githubusercontent.com/envoyproxy/protoc-gen-validate/v0.4.1/validate/validate.proto --create-dirs -o include/validate/validate.proto \
|
|
&& curl https://raw.githubusercontent.com/grpc-ecosystem/grpc-gateway/v2.2.0/protoc-gen-openapiv2/options/annotations.proto --create-dirs -o include/protoc-gen-openapiv2/options/annotations.proto \
|
|
&& curl https://raw.githubusercontent.com/grpc-ecosystem/grpc-gateway/v2.2.0/protoc-gen-openapiv2/options/openapiv2.proto --create-dirs -o include/protoc-gen-openapiv2/options/openapiv2.proto \
|
|
&& curl https://raw.githubusercontent.com/googleapis/googleapis/master/google/api/annotations.proto --create-dirs -o include/google/api/annotations.proto \
|
|
&& curl https://raw.githubusercontent.com/googleapis/googleapis/master/google/api/http.proto --create-dirs -o include/google/api/http.proto \
|
|
&& curl https://raw.githubusercontent.com/googleapis/googleapis/master/google/api/field_behavior.proto --create-dirs -o include/google/api/field_behavior.proto
|
|
|
|
#zitadel protos
|
|
COPY proto/ include/.
|
|
|
|
|
|
#######################
|
|
## With this step we prepare all node_modules, this helps caching the build
|
|
## Speed up this step by mounting your local node_modules directory
|
|
#######################
|
|
FROM node:${NODE_VERSION} as npm-base
|
|
WORKDIR /console
|
|
|
|
COPY console/package.json console/package-lock.json ./
|
|
RUN npm install
|
|
|
|
COPY console .
|
|
COPY --from=base /proto /proto
|
|
COPY --from=base /usr/local/bin /usr/local/bin/.
|
|
COPY build/console build/console/
|
|
RUN build/console/generate-grpc.sh
|
|
|
|
|
|
#######################
|
|
## copy for local dev
|
|
#######################
|
|
FROM scratch as npm-copy
|
|
COPY --from=npm-base /console/src/app/proto/generated ./console/src/app/proto/generated
|
|
|
|
#######################
|
|
## angular dev build
|
|
#######################
|
|
FROM npm-base as dev-angular-build
|
|
RUN npm install -g @angular/cli
|
|
|
|
#######################
|
|
## angular lint workspace and prod build
|
|
#######################
|
|
FROM npm-base as prod-angular-build
|
|
RUN npm run lint
|
|
RUN npm run prodbuild
|
|
|
|
#######################
|
|
## Go dependencies
|
|
## Speed up this step by mounting your local go mod pkg directory
|
|
#######################
|
|
FROM golang:${GO_VERSION} as go-dep
|
|
RUN mkdir -p src/github.com/caos/zitadel
|
|
# copy mod definitions
|
|
COPY tools src/github.com/caos/zitadel/tools
|
|
COPY ./go.* src/github.com/caos/zitadel
|
|
|
|
# install all dependencies
|
|
WORKDIR /go/src/github.com/caos/zitadel
|
|
RUN go mod download
|
|
RUN ./tools/install.sh
|
|
|
|
FROM go-dep AS go-gen
|
|
COPY --from=base /proto /proto
|
|
COPY --from=base /usr/local/bin /usr/local/bin/.
|
|
COPY build/zitadel/generate-grpc.sh build/zitadel/generate-grpc.sh
|
|
COPY internal/protoc internal/protoc
|
|
RUN build/zitadel/generate-grpc.sh
|
|
|
|
#######################
|
|
## Go base build
|
|
#######################
|
|
FROM go-gen as go-base
|
|
# copy all zitadel files
|
|
COPY . .
|
|
|
|
|
|
#######################
|
|
## copy for local dev
|
|
#######################
|
|
FROM scratch as go-copy
|
|
COPY --from=go-gen /go/src/github.com/caos/zitadel/pkg/grpc ./pkg/grpc
|
|
COPY --from=go-gen /go/src/github.com/caos/zitadel/openapi/v2/zitadel ./openapi/v2/zitadel
|
|
COPY --from=go-gen /go/src/github.com/caos/zitadel/internal/protoc/protoc-gen-authoption/templates.gen.go ./internal/protoc/protoc-gen-authoption/templates.gen.go
|
|
COPY --from=go-gen /go/src/github.com/caos/zitadel/internal/protoc/protoc-gen-authoption/authoption/options.pb.go ./internal/protoc/protoc-gen-authoption/authoption/options.pb.go
|
|
|
|
|
|
#######################
|
|
## Go test
|
|
#######################
|
|
FROM go-base as go-test
|
|
COPY . .
|
|
|
|
# Migrations for cockroach-secure
|
|
RUN go install github.com/rakyll/statik
|
|
RUN ./build/operator/prebuild.sh ./migrations
|
|
|
|
RUN go test -race -v -coverprofile=profile.cov $(go list ./... | grep -v /operator/)
|
|
|
|
|
|
#######################
|
|
## Go test results
|
|
#######################
|
|
FROM scratch as go-codecov
|
|
COPY --from=go-test /go/src/github.com/caos/zitadel/profile.cov profile.cov
|
|
|
|
|
|
#######################
|
|
## Go prod build
|
|
#######################
|
|
FROM go-test as prod-go-build
|
|
ARG BUILDARCH
|
|
COPY --from=prod-angular-build console/dist/console console/dist/console/
|
|
RUN go get github.com/rakyll/statik \
|
|
&& ./build/console/generate-static.sh \
|
|
&& ./build/login/generate-static.sh \
|
|
&& ./build/notification/generate-static.sh \
|
|
&& ./build/zitadel/generate-static.sh \
|
|
&& ./build/zitadel/generate-openapi-static.sh
|
|
RUN CGO_ENABLED=0 GOOS=linux GOARCH=${BUILDARCH} go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o zitadel-linux-${BUILDARCH} cmd/zitadel/main.go
|
|
|
|
|
|
#######################
|
|
## Go dev build
|
|
#######################
|
|
FROM go-base as dev-go-build
|
|
RUN go get github.com/go-delve/delve/cmd/dlv
|
|
|
|
|
|
#######################
|
|
## Final Production Image
|
|
#######################
|
|
FROM alpine:latest as artifact
|
|
ARG BUILDARCH
|
|
RUN adduser -D zitadel
|
|
COPY cmd/zitadel/*.yaml /app/
|
|
COPY --from=prod-go-build /go/src/github.com/caos/zitadel/zitadel-linux-${BUILDARCH} /app/zitadel
|
|
RUN chmod a+x /app/zitadel
|
|
RUN ls -la /
|
|
|
|
|
|
#######################
|
|
## Scratch Image
|
|
#######################
|
|
FROM scratch as final
|
|
COPY --from=artifact /etc/passwd /etc/passwd
|
|
COPY --from=artifact /etc/ssl/certs /etc/ssl/certs
|
|
COPY --from=artifact /app /
|
|
USER zitadel
|
|
HEALTHCHECK NONE
|
|
ENTRYPOINT ["/zitadel"] |