Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor 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
AlekSIS®
Official
AlekSIS-Core
Commits
5ec792e4
Verified
Commit
5ec792e4
authored
5 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Patches
Plain Diff
[Docker] Move static files to /usr/share
Containers cannot update shared volumes from new image versions
parent
3e2a5977
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#801
passed with warnings
5 years ago
Stage: test
Stage: build
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Dockerfile
+4
-3
4 additions, 3 deletions
Dockerfile
docker/entrypoint.sh
+0
-1
0 additions, 1 deletion
docker/entrypoint.sh
docker/nginx/nginx.conf
+0
-4
0 additions, 4 deletions
docker/nginx/nginx.conf
with
4 additions
and
8 deletions
Dockerfile
+
4
−
3
View file @
5ec792e4
...
...
@@ -8,7 +8,7 @@ ENV PIP_DISABLE_PIP_VERSION_CHECK 1
ENV
PIP_NO_CACHE_DIR 1
# Configure app settings for build and runtime
ENV
ALEKSIS_static__root /
var/lib
/aleksis/static
ENV
ALEKSIS_static__root /
usr/share
/aleksis/static
ENV
ALEKSIS_media__root /var/lib/aleksis/media
ENV
ALEKSIS_backup__location /var/lib/aleksis/backups
...
...
@@ -30,7 +30,7 @@ WORKDIR /usr/src/app
COPY
LICENCE.rst README.rst manage.py poetry.lock pyproject.toml ./
COPY
aleksis ./aleksis/
RUN
set
-e
;
\
mkdir
-p
/var/lib/aleksis/media /
var/lib
/aleksis/static /var/lib/aleksis/backups
;
\
mkdir
-p
/var/lib/aleksis/media /
usr/share
/aleksis/static /var/lib/aleksis/backups
;
\
eatmydata pip
install
poetry
;
\
poetry config virtualenvs.create
false
;
\
eatmydata poetry
install
;
\
...
...
@@ -48,7 +48,8 @@ RUN set -e; \
# Build messages and assets
RUN
eatmydata python manage.py compilemessages
&&
\
eatmydata python manage.py yarn
install
\
eatmydata python manage.py yarn
install
&&
\
eatmydata python manage.py collectstatic
--no-input
--clear
# Clean up build dependencies
RUN
set
-e
;
\
...
...
This diff is collapsed.
Click to expand it.
docker/entrypoint.sh
+
0
−
1
View file @
5ec792e4
...
...
@@ -17,7 +17,6 @@ while ! nc -z $ALEKSIS_database__host $ALEKSIS_database__port; do
sleep
0.1
done
python manage.py collectstatic
--no-input
--clear
python manage.py migrate
if
[[
-n
"
$@
"
]]
;
then
...
...
This diff is collapsed.
Click to expand it.
docker/nginx/nginx.conf
+
0
−
4
View file @
5ec792e4
...
...
@@ -15,8 +15,4 @@ server {
location
/media/
{
alias
/var/lib/aleksis/media/
;
}
location
/static/
{
alias
/var/lib/aleksis/static/
;
}
}
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