root: remove remainders from gen
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
parent
9469f86f65
commit
507b8d43fb
12
Dockerfile
12
Dockerfile
|
@ -18,17 +18,6 @@ COPY ./website /static/
|
||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=production
|
||||||
RUN cd /static && npm i && npm run build-docs-only
|
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
|
# Stage 3: Generate API Client
|
||||||
FROM openapitools/openapi-generator-cli as go-api-builder
|
FROM openapitools/openapi-generator-cli as go-api-builder
|
||||||
|
|
||||||
|
@ -48,7 +37,6 @@ RUN docker-entrypoint.sh generate \
|
||||||
FROM node as web-builder
|
FROM node as web-builder
|
||||||
|
|
||||||
COPY ./web /static/
|
COPY ./web /static/
|
||||||
COPY --from=web-api-builder /local/web/api /static/api
|
|
||||||
|
|
||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=production
|
||||||
RUN cd /static && npm i && npm run build
|
RUN cd /static && npm i && npm run build
|
||||||
|
|
|
@ -7,24 +7,6 @@ trigger:
|
||||||
- version-*
|
- version-*
|
||||||
|
|
||||||
stages:
|
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
|
- stage: lint
|
||||||
jobs:
|
jobs:
|
||||||
- job: eslint
|
- job: eslint
|
||||||
|
@ -35,11 +17,6 @@ stages:
|
||||||
inputs:
|
inputs:
|
||||||
versionSpec: '16.x'
|
versionSpec: '16.x'
|
||||||
displayName: 'Install Node.js'
|
displayName: 'Install Node.js'
|
||||||
- task: DownloadPipelineArtifact@2
|
|
||||||
inputs:
|
|
||||||
buildType: 'current'
|
|
||||||
artifactName: 'ts_api_client'
|
|
||||||
path: "web/api/"
|
|
||||||
- task: Npm@1
|
- task: Npm@1
|
||||||
inputs:
|
inputs:
|
||||||
command: 'install'
|
command: 'install'
|
||||||
|
@ -57,11 +34,6 @@ stages:
|
||||||
inputs:
|
inputs:
|
||||||
versionSpec: '16.x'
|
versionSpec: '16.x'
|
||||||
displayName: 'Install Node.js'
|
displayName: 'Install Node.js'
|
||||||
- task: DownloadPipelineArtifact@2
|
|
||||||
inputs:
|
|
||||||
buildType: 'current'
|
|
||||||
artifactName: 'ts_api_client'
|
|
||||||
path: "web/api/"
|
|
||||||
- task: Npm@1
|
- task: Npm@1
|
||||||
inputs:
|
inputs:
|
||||||
command: 'install'
|
command: 'install'
|
||||||
|
@ -79,11 +51,6 @@ stages:
|
||||||
inputs:
|
inputs:
|
||||||
versionSpec: '16.x'
|
versionSpec: '16.x'
|
||||||
displayName: 'Install Node.js'
|
displayName: 'Install Node.js'
|
||||||
- task: DownloadPipelineArtifact@2
|
|
||||||
inputs:
|
|
||||||
buildType: 'current'
|
|
||||||
artifactName: 'ts_api_client'
|
|
||||||
path: "web/api/"
|
|
||||||
- task: Npm@1
|
- task: Npm@1
|
||||||
inputs:
|
inputs:
|
||||||
command: 'install'
|
command: 'install'
|
||||||
|
@ -103,11 +70,6 @@ stages:
|
||||||
inputs:
|
inputs:
|
||||||
versionSpec: '16.x'
|
versionSpec: '16.x'
|
||||||
displayName: 'Install Node.js'
|
displayName: 'Install Node.js'
|
||||||
- task: DownloadPipelineArtifact@2
|
|
||||||
inputs:
|
|
||||||
buildType: 'current'
|
|
||||||
artifactName: 'ts_api_client'
|
|
||||||
path: "web/api/"
|
|
||||||
- task: Npm@1
|
- task: Npm@1
|
||||||
inputs:
|
inputs:
|
||||||
command: 'install'
|
command: 'install'
|
||||||
|
|
Reference in a new issue