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
6d9f94a3
Verified
Commit
6d9f94a3
authored
4 years ago
by
Tom Teichler
Browse files
Options
Downloads
Patches
Plain Diff
Fix ONBUILD step
parent
3a73626d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!550
Resolve "[Docker] Allow using core image as base image for app/distribution images"
Pipeline
#6653
failed
4 years ago
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Dockerfile
+17
-9
17 additions, 9 deletions
Dockerfile
with
17 additions
and
9 deletions
Dockerfile
+
17
−
9
View file @
6d9f94a3
...
...
@@ -55,12 +55,6 @@ RUN set -e; \
${
ALEKSIS_backup__location
}
;
\
eatmydata pip
install
AlekSIS-Core
\[
$EXTRAS
\]
$APP_VERSION
# Installl additional apps
ONBUILD RUN
set
-e
;
\
if
[
!
-z
"
$APPS
"
]
;
then
\
eatmydata pip
install
$APPS
;
\
fi
# Define entrypoint, volumes and uWSGI running on port 8000
EXPOSE
8000
VOLUME
${ALEKSIS_media__root} ${ALEKSIS_backup__location}
...
...
@@ -76,7 +70,7 @@ RUN eatmydata aleksis-admin yarn install; \
# Clean up build dependencies
FROM
assets
AS
clean
ONBUILD
RUN
set
-e
;
\
RUN
set
-e
;
\
eatmydata apt-get remove
--purge
-y
\
build-essential
\
gettext
\
...
...
@@ -84,10 +78,8 @@ ONBUILD RUN set -e; \
libssl-dev
\
libldap2-dev
\
libsasl2-dev
\
yarnpkg
;
\
eatmydata apt-get autoremove
--purge
-y
;
\
apt-get clean
-y
;
\
rm
-f
/var/lib/apt/lists/
*
_
*
;
\
rm
-rf
/root/.cache
# Drop privileges for runtime to www-data
...
...
@@ -98,3 +90,19 @@ RUN chown -R www-data:www-data \
${
ALEKSIS_media__root
}
\
${
ALEKSIS_backup__location
}
USER
33:33
# Additional steps
ONBUILD
USER
0:0
ONBUILD RUN
set
-e
;
\
if
[
-n
"
$APPS
"
]
;
then
\
eatmydata pip
install
$APPS
;
\
fi
;
\
eatmydata aleksis-admin yarn
install
;
\
eatmydata aleksis-admin collectstatic
;
\
rm
-rf
/usr/local/share/.cache
;
\
eatmydata apt-get remove
--purge
-y
yarnpkg
;
\
eatmydata apt-get autoremove
--purge
-y
;
\
apt-get clean
-y
;
\
rm
-f
/var/lib/apt/lists/
*
_
*
;
\
rm
-rf
/root/.cache
ONBUILD
USER
33:33
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