From 507b8d43fb88b1de4a617d4a6852a5f2bffa5fca Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Mon, 23 Aug 2021 10:16:24 +0200 Subject: [PATCH] root: remove remainders from gen Signed-off-by: Jens Langhammer --- Dockerfile | 12 ------------ web/azure-pipelines.yml | 38 -------------------------------------- 2 files changed, 50 deletions(-) diff --git a/Dockerfile b/Dockerfile index f079270f9..22ef80e19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,17 +18,6 @@ COPY ./website /static/ ENV NODE_ENV=production RUN cd /static && npm i && npm run build-docs-only -# Stage 3: Build web API -FROM openapitools/openapi-generator-cli as web-api-builder - -COPY ./schema.yml /local/schema.yml - -RUN docker-entrypoint.sh generate \ - -i /local/schema.yml \ - -g typescript-fetch \ - -o /local/web/api \ - --additional-properties=typescriptThreePlus=true,supportsES6=true,npmName=authentik-api,npmVersion=1.0.0 - # Stage 3: Generate API Client FROM openapitools/openapi-generator-cli as go-api-builder @@ -48,7 +37,6 @@ RUN docker-entrypoint.sh generate \ FROM node as web-builder COPY ./web /static/ -COPY --from=web-api-builder /local/web/api /static/api ENV NODE_ENV=production RUN cd /static && npm i && npm run build diff --git a/web/azure-pipelines.yml b/web/azure-pipelines.yml index 21bead4d5..513499846 100644 --- a/web/azure-pipelines.yml +++ b/web/azure-pipelines.yml @@ -7,24 +7,6 @@ trigger: - version-* stages: - - stage: generate - jobs: - - job: generate_api - pool: - vmImage: 'ubuntu-latest' - steps: - - task: NodeTool@0 - inputs: - versionSpec: '16.x' - displayName: 'Install Node.js' - - task: CmdLine@2 - inputs: - script: make gen-web - - task: PublishPipelineArtifact@1 - inputs: - targetPath: 'web/api/' - artifact: 'ts_api_client' - publishLocation: 'pipeline' - stage: lint jobs: - job: eslint @@ -35,11 +17,6 @@ stages: inputs: versionSpec: '16.x' displayName: 'Install Node.js' - - task: DownloadPipelineArtifact@2 - inputs: - buildType: 'current' - artifactName: 'ts_api_client' - path: "web/api/" - task: Npm@1 inputs: command: 'install' @@ -57,11 +34,6 @@ stages: inputs: versionSpec: '16.x' displayName: 'Install Node.js' - - task: DownloadPipelineArtifact@2 - inputs: - buildType: 'current' - artifactName: 'ts_api_client' - path: "web/api/" - task: Npm@1 inputs: command: 'install' @@ -79,11 +51,6 @@ stages: inputs: versionSpec: '16.x' displayName: 'Install Node.js' - - task: DownloadPipelineArtifact@2 - inputs: - buildType: 'current' - artifactName: 'ts_api_client' - path: "web/api/" - task: Npm@1 inputs: command: 'install' @@ -103,11 +70,6 @@ stages: inputs: versionSpec: '16.x' displayName: 'Install Node.js' - - task: DownloadPipelineArtifact@2 - inputs: - buildType: 'current' - artifactName: 'ts_api_client' - path: "web/api/" - task: Npm@1 inputs: command: 'install'