Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Plateforme Calque Front
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ERASME
Plateforme Calque Front
Commits
69937fe5
Commit
69937fe5
authored
1 year ago
by
Pierre-Gilles Levallois
Browse files
Options
Downloads
Patches
Plain Diff
no-cache option for docker image build
parent
3079538f
No related branches found
No related tags found
No related merge requests found
Pipeline
#92781
passed
1 year ago
Stage: Build Calqul Frontend
Stage: Deploy Calqul Frontend
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
Dockerfile
+16
-14
16 additions, 14 deletions
Dockerfile
src/environments/environment.sample.ts
+6
-3
6 additions, 3 deletions
src/environments/environment.sample.ts
with
23 additions
and
18 deletions
.gitlab-ci.yml
+
1
−
1
View file @
69937fe5
...
@@ -39,7 +39,7 @@ variables:
...
@@ -39,7 +39,7 @@ variables:
-
echo "Preparing Deployment on $NAMESPACE ($NAMESPACE_ENV)"
-
echo "Preparing Deployment on $NAMESPACE ($NAMESPACE_ENV)"
.build_and_push_image
:
&build_and_push_image
.build_and_push_image
:
&build_and_push_image
-
docker build --pull --tag "$CI_REGISTRY_IMAGE/$IMAGE_NAME:latest" .
-
docker build
--no-cache
--pull --tag "$CI_REGISTRY_IMAGE/$IMAGE_NAME:latest" .
-
docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:latest"
-
docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:latest"
# Docker Authentification anchor
# Docker Authentification anchor
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
16
−
14
View file @
69937fe5
...
@@ -4,6 +4,8 @@ FROM node:19.9.0-alpine3.18 AS builder
...
@@ -4,6 +4,8 @@ FROM node:19.9.0-alpine3.18 AS builder
# Proxy : uniquement pour un build sur le poste de travail.
# Proxy : uniquement pour un build sur le poste de travail.
# ENV http_proxy=http://proxyhttppronoauth.grandlyon.fr:8080
# ENV http_proxy=http://proxyhttppronoauth.grandlyon.fr:8080
# ENV https_proxy=http://proxyhttppronoauth.grandlyon.fr:8080
# ENV https_proxy=http://proxyhttppronoauth.grandlyon.fr:8080
# RUN npm config set proxy http://proxyhttppronoauth.grandlyon.fr:8080 && \
# npm config set https-proxy http://proxyhttppronoauth.grandlyon.fr:8080
WORKDIR
/app
WORKDIR
/app
COPY
. .
COPY
. .
...
@@ -14,20 +16,20 @@ RUN npm install -g @angular/cli && \
...
@@ -14,20 +16,20 @@ RUN npm install -g @angular/cli && \
# ng build --configuration development --base-href=./
# ng build --configuration development --base-href=./
# Stage 2: Créer une image HTTPd minimale
#
# Stage 2: Créer une image HTTPd minimale
FROM
httpd:2.4
#
FROM httpd:2.4
COPY
--from=builder /app/dist/frontendapp/ /usr/local/apache2/htdocs/
#
COPY --from=builder /app/dist/frontendapp/ /usr/local/apache2/htdocs/
COPY
httpd.conf /usr/local/apache2/conf/httpd.conf
#
COPY httpd.conf /usr/local/apache2/conf/httpd.conf
RUN
chgrp
-R
0 /usr/local/apache2
&&
\
#
RUN chgrp -R 0 /usr/local/apache2 && \
chmod
-R
g+rwx /usr/local/apache2
#
chmod -R g+rwx /usr/local/apache2
#
FROM nginx:latest
FROM
nginx:latest
#
# copy the custom nginx configuration file to the container in the
# copy the custom nginx configuration file to the container in the
#
# default location
# default location
#
COPY nginx.conf /etc/nginx/nginx.conf
COPY
nginx.conf /etc/nginx/nginx.conf
#
# copy the built Angular app files to the default nginx html directory
# copy the built Angular app files to the default nginx html directory
#
COPY --from=builder /app/dist/frontendapp/ /usr/share/nginx/html
COPY
--from=builder /app/dist/frontendapp/ /usr/share/nginx/html
#
RUN chgrp -R 0 /var/log/nginx /var/run/ /usr/share/nginx && \
RUN
chgrp
-R
0 /var/log/nginx /var/run/ /usr/share/nginx
&&
\
#
chmod g+rwx /var/cache/nginx /var/run /var/log/nginx
chmod
g+rwx /var/cache/nginx /var/run /var/log/nginx
EXPOSE
8080
EXPOSE
8080
This diff is collapsed.
Click to expand it.
src/environments/environment.sample.ts
+
6
−
3
View file @
69937fe5
export
const
environment
=
{
export
const
environment
=
{
production
:
true
,
production
:
true
,
searchUrl
:
'
https://api-adresse.data.gouv.fr/search
'
,
searchUrl
:
'
https://api-adresse.data.gouv.fr/search
'
,
geoserver
:
'
https://${GEOSERVER_NAME}/geoserver/Metropole/
'
,
googleSatellite
:
'
http://mt0.google.com/vt/lyrs=s&hl=en&x={x}&y={y}&z={z}
'
,
googleSatellite
:
'
http://mt0.google.com/vt/lyrs=s&hl=en&x={x}&y={y}&z={z}
'
,
communesURL
:
communesURL
:
'
https://${GEOSERVER_NAME}/geoserver/Metropole/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=Metropole:communes&outputFormat=application/json&SRSNAME=EPSG:3857
'
,
'
ows?service=WFS&version=1.0.0&request=GetFeature&typeName=Metropole:communes&outputFormat=application/json&SRSNAME=EPSG:3857
'
,
communeLegendURL
:
'
wms?REQUEST=GetLegendGraphic&VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=Metropole:communes&LEGEND_OPTIONS=columns:3
'
,
plantabiliteVecteurURL
:
plantabiliteVecteurURL
:
'
https://${GEOSERVER_NAME}/geoserver/Metropole/
ows?service=WFS&version=1.0.0&request=GetFeature&typeName=Metropole:tiles&outputFormat=application/json&SRSNAME=EPSG:3857
'
,
'
ows?service=WFS&version=1.0.0&request=GetFeature&typeName=Metropole:tiles&outputFormat=application/json&SRSNAME=EPSG:3857
'
,
plantabiliteLegendURL
:
plantabiliteLegendURL
:
'
https://${GEOSERVER_NAME}/geoserver/Metropole/
wms?REQUEST=GetLegendGraphic&VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=Metropole:tiles&LEGEND_OPTIONS=columns:3
'
,
'
wms?REQUEST=GetLegendGraphic&VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=Metropole:tiles&LEGEND_OPTIONS=columns:3
'
,
geoserverWMS
:
'
https://${GEOSERVER_NAME}/geoserver/gwc/service/wmts
'
,
geoserverWMS
:
'
https://${GEOSERVER_NAME}/geoserver/gwc/service/wmts
'
,
plantabiliteRasterName
:
'
Metropole:tiles
'
,
plantabiliteRasterName
:
'
Metropole:tiles
'
,
centerLatitude
:
45.7675
,
centerLatitude
:
45.7675
,
...
...
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