Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nmaas Portal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nmaas
nmaas Portal
Commits
68ebe7e6
Commit
68ebe7e6
authored
4 years ago
by
Lukasz Lopatowski
Browse files
Options
Downloads
Patches
Plain Diff
Fixing Docker build
parent
8d78daf6
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+1
-1
1 addition, 1 deletion
.gitignore
Dockerfile
+3
-3
3 additions, 3 deletions
Dockerfile
package-lock.json
+16990
-0
16990 additions, 0 deletions
package-lock.json
with
16994 additions
and
4 deletions
.gitignore
+
1
−
1
View file @
68ebe7e6
...
@@ -25,7 +25,7 @@ npm-debug.log
...
@@ -25,7 +25,7 @@ npm-debug.log
testem.log
testem.log
/typings
/typings
gradle-app.setting
gradle-app.setting
package-lock.json
/.gradle/
# e2e
# e2e
/e2e/*.js
/e2e/*.js
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
3
−
3
View file @
68ebe7e6
FROM
alpine:3.13
as
builder
FROM
alpine:3.13
as
builder
COPY
. /build
/nmaas-portal
COPY
. /build
WORKDIR
/build
/nmaas-portal
WORKDIR
/build
RUN
apk add nodejs nodejs-npm
RUN
apk add nodejs nodejs-npm
RUN
npm
install
-g
@angular/cli
RUN
npm
install
-g
@angular/cli
...
@@ -16,7 +16,7 @@ ARG webdir=/usr/share/nginx/html
...
@@ -16,7 +16,7 @@ ARG webdir=/usr/share/nginx/html
RUN
mkdir
-p
${
webdir
}
/config
RUN
mkdir
-p
${
webdir
}
/config
RUN
apk add gettext
RUN
apk add gettext
COPY
--from=builder /build/
nmaas-portal/
build/app/ ${webdir}
COPY
--from=builder /build/build/app/ ${webdir}
COPY
docker/nginx.conf /etc/nginx/nginx.conf
COPY
docker/nginx.conf /etc/nginx/nginx.conf
COPY
docker/config.template.json ${webdir}/config/config.template.json
COPY
docker/config.template.json ${webdir}/config/config.template.json
COPY
docker/run_portal.sh /scripts/run_portal.sh
COPY
docker/run_portal.sh /scripts/run_portal.sh
...
...
This diff is collapsed.
Click to expand it.
package-lock.json
0 → 100644
+
16990
−
0
View file @
68ebe7e6
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment