Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
Wiki
Manage
Activity
Members
Labels
Plan
Issues
53
Issue boards
Milestones
Wiki
Code
Merge requests
6
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MDM Lab
Wiki
Commits
8bdf9243
Commit
8bdf9243
authored
1 year ago
by
Remi PLANEL
Browse files
Options
Downloads
Patches
Plain Diff
Public as mount volume
parent
557e40bb
No related branches found
No related tags found
1 merge request
!209
Public as mount volume
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+4
-4
4 additions, 4 deletions
.gitlab-ci.yml
Dockerfile
+4
-0
4 additions, 0 deletions
Dockerfile
deploy/df-wiki/templates/deployment.yaml
+9
-9
9 additions, 9 deletions
deploy/df-wiki/templates/deployment.yaml
with
17 additions
and
13 deletions
.gitlab-ci.yml
+
4
−
4
View file @
8bdf9243
...
...
@@ -145,7 +145,7 @@ deploy:meilisearch:prod:
url
:
"
https://${MEILI_HOST_PROD}"
############### DELETE RELEASE
delete-meili-helm-release
:
rules
:
...
...
@@ -478,15 +478,15 @@ build:prod:wiki:
-
echo "Wiki pod is ready"
-
WIKI_POD=$(kubectl --namespace ${KUBE_NAMESPACE} get pods -l "app.kubernetes.io/name=df-wiki" --output jsonpath='{.items[0].metadata.name}')
-
echo ${WIKI_POD}
-
kubectl --namespace ${KUBE_NAMESPACE} cp scripts/copy-structure-data.sh ${WIKI_POD}:/structure-data/sanitized-dump
-
kubectl --namespace ${KUBE_NAMESPACE} exec ${WIKI_POD} --
bash -c 'cd /structure-data/sanitized-dump && bash copy-structure-data.sh'
#
- kubectl --namespace ${KUBE_NAMESPACE} cp scripts/copy-structure-data.sh ${WIKI_POD}:/structure-data/sanitized-dump
-
kubectl --namespace ${KUBE_NAMESPACE} exec ${WIKI_POD} --
rsync -avz /public-website/ /usr/share/nginx/html/
deploy:dev
:
extends
:
.deploy
rules
:
-
if
:
$CI_COMMIT_BRANCH == "dev" || $CI_COMMIT_BRANCH == "
foldseek-pages
"
-
if
:
$CI_COMMIT_BRANCH == "dev" || $CI_COMMIT_BRANCH == "
public-as-mount-volume
"
needs
:
-
"
build:dev:wiki"
when
:
manual
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
4
−
0
View file @
8bdf9243
...
...
@@ -91,9 +91,13 @@ RUN npm run generate
FROM
nginx:1.25-bookworm
# RUN rm -rf /usr/share/nginx/html/*
RUN
apt update
-y
&&
apt
install
rsync
-y
RUN
mkdir
/public-website
RUN
chown
nginx:nginx /public-website
COPY
nginx.conf /etc/nginx/nginx.conf
RUN
chown
nginx:nginx /usr/share/nginx/html
COPY
--chown=nginx:nginx --from=generate /usr/src/app/.output/public /usr/share/nginx/html
# RUN chmod -R nginx:nginx /usr/share/nginx/html/
USER
nginx
COPY
--chown=nginx:nginx --from=generate /usr/src/app/.output/public /public-website
CMD
["nginx", "-g", "daemon off;"]
\ No newline at end of file
This diff is collapsed.
Click to expand it.
deploy/df-wiki/templates/deployment.yaml
+
9
−
9
View file @
8bdf9243
...
...
@@ -39,14 +39,14 @@ spec:
-
name
:
http
containerPort
:
{{
.Values.service.port
}}
protocol
:
TCP
#
livenessProbe:
#
httpGet:
#
path: /
#
port: http
#
readinessProbe:
#
httpGet:
#
path: /
#
port: http
livenessProbe
:
httpGet
:
path
:
/
wiki/
port
:
http
readinessProbe
:
httpGet
:
path
:
/
wiki/
port
:
http
resources
:
{{
- toYaml .Values.resources | nindent 12
}}
volumeMounts
:
...
...
@@ -55,7 +55,7 @@ spec:
-
name
:
nginx-config
mountPath
:
/etc/nginx/conf.d/
-
name
:
structure-data-pvc
mountPath
:
/
structure-data
mountPath
:
/
usr/share/nginx/html
-
name
:
website-pvc
mountPath
:
/website
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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