Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Ingegneria del software
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
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sameeramadusal.kaluwaduge@studenti.unimi.it
Ingegneria del software
Commits
d06eaf65
Verified
Commit
d06eaf65
authored
Jun 8, 2023
by
Marco Aceti
Browse files
Options
Downloads
Patches
Plain Diff
Update Docker image and stuff
parent
c27610fd
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
.dockerignore
+4
-7
4 additions, 7 deletions
.dockerignore
.gitlab-ci.yml
+0
-25
0 additions, 25 deletions
.gitlab-ci.yml
Dockerfile
+16
-11
16 additions, 11 deletions
Dockerfile
docker-run.sh
+2
-3
2 additions, 3 deletions
docker-run.sh
with
22 additions
and
46 deletions
.dockerignore
+
4
−
7
View file @
d06eaf65
.git/*
.git/*
.git*
.git*
Dockerfile
.mdbook-plantuml-cache
docker-run.sh
.dockerignore
.dockerignore
.idea/*
.idea/*
.jekyll-cache/*
book/
**/.jekyll-cache/*
Dockerfile
_site/*
docker-run.sh
assets/resized/*
uml/*
README.md
README.md
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
deleted
100644 → 0
+
0
−
25
View file @
c27610fd
image
:
ruby:3.1
variables
:
JEKYLL_ENV
:
production
LC_ALL
:
C.UTF-8
before_script
:
-
bundle install
build
:
stage
:
build
script
:
-
apt-get update -y
-
apt-get install -y wget default-jre default-jdk graphviz
-
wget https://github.com/plantuml/plantuml/releases/download/v1.2022.13/plantuml-1.2022.13.jar -O plantuml.jar
-
echo "#!/bin/bash" > plantuml
-
echo "java -jar $PWD/plantuml.jar \"\$1\" \"\$2\"" >> plantuml
-
mv plantuml /usr/bin/plantuml
-
chmod +x /usr/bin/plantuml
-
sed -i "s/\/sweng/\/sweng\/$CI_COMMIT_REF_SLUG/g" _config.yml
-
bundle exec jekyll build -d build
artifacts
:
name
:
jekyll-build.zip
paths
:
-
build
This diff is collapsed.
Click to expand it.
Dockerfile
+
16
−
11
View file @
d06eaf65
FROM
ruby:3.1
# plantuml image
FROM
ubuntu
AS
plantuml
# Install graphviz and PlantUML
RUN
apt-get update
-y
RUN
apt-get update
-y
RUN
apt-get
install
-y
wget default-jre default-jdk graphviz
RUN
apt-get
install
-y
wget default-jre default-jdk graphviz
RUN
wget https://github.com/plantuml/plantuml/releases/download/v1.2022.13/plantuml-1.2022.13.jar
-O
plantuml.jar
RUN
wget https://github.com/plantuml/plantuml/releases/download/v1.2022.13/plantuml-1.2022.13.jar
-O
plantuml.jar
...
@@ -8,16 +8,21 @@ RUN echo "#!/bin/bash" > plantuml ; echo "java -jar $PWD/plantuml.jar \"\$1\" \"
...
@@ -8,16 +8,21 @@ RUN echo "#!/bin/bash" > plantuml ; echo "java -jar $PWD/plantuml.jar \"\$1\" \"
RUN
mv
plantuml /usr/bin/plantuml
RUN
mv
plantuml /usr/bin/plantuml
RUN
chmod
+x /usr/bin/plantuml
RUN
chmod
+x /usr/bin/plantuml
# Install Ruby project dependencies (Jekyll and plugins)
# main image
WORKDIR
/usr/src/app
FROM
rust:slim-buster
RUN
apt-get update
&&
\
apt-get
install
--no-install-recommends
-y
\
libssl-dev pkg-config
RUN
cargo
install
mdbook
RUN
cargo
install
mdbook-plantuml
COPY
Gemfile .
COPY
--from=plantuml /usr/bin/plantuml /usr/bin/plantuml
COPY
Gemfile.lock .
RUN
bundle
install
EXPOSE
3000
WORKDIR
/usr/src/app
# Copy project files
# Copy project files
COPY
. .
COPY
. .
EXPOSE
4000
ENTRYPOINT
["mdbook"]
EXPOSE
35729
ENTRYPOINT
["bundle", "exec", "jekyll", "serve", "--host", "0.0.0.0"]
This diff is collapsed.
Click to expand it.
docker-run.sh
+
2
−
3
View file @
d06eaf65
...
@@ -5,8 +5,7 @@ docker run \
...
@@ -5,8 +5,7 @@ docker run \
--interactive
\
--interactive
\
--tty
\
--tty
\
--mount
type
=
bind
,source
=
"
$(
pwd
)
"
,target
=
/usr/src/app
\
--mount
type
=
bind
,source
=
"
$(
pwd
)
"
,target
=
/usr/src/app
\
--publish
4000:4000
\
--publish
3000:3000
\
--publish
35729:35729
\
--user
$(
id
-u
)
:
$(
id
-g
)
\
--user
$(
id
-u
)
:
$(
id
-g
)
\
appunti_sweng
\
appunti_sweng
\
--livereload
serve
--hostname
0.0.0.0
--port
3000
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