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
e8d04b41
Commit
e8d04b41
authored
3 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch '595-docker-install-some-system-utilities-in-base-image' into 'master'
Resolve "[Docker] Install some system utilities in base image" Closes
#595
See merge request
!870
parents
a31f14c1
00c2907b
Branches
616-docs-document-dashboard-and-dashboard-widgets
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!870
Resolve "[Docker] Install some system utilities in base image"
Pipeline
#49273
canceled
3 years ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.rst
+1
-0
1 addition, 0 deletions
CHANGELOG.rst
Dockerfile
+5
-0
5 additions, 0 deletions
Dockerfile
with
6 additions
and
0 deletions
CHANGELOG.rst
+
1
−
0
View file @
e8d04b41
...
...
@@ -35,6 +35,7 @@ Changed
* Name collisions are resolved by prefixing with the app label
* Apps can extend SHELL_PLUS_APP_PREFIXES and SHELL_PLUS_DONT_LOAD
* [Docker] Base image now contains curl, grep, less, sed, and pspg
* Views raising a 404 error can now customise the message that is displayed on the error page
* OpenID Connect is enabled by default now, without RSA support
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
5
−
0
View file @
e8d04b41
...
...
@@ -19,6 +19,7 @@ ENV ALEKSIS_static__root /usr/share/aleksis/static
ENV
ALEKSIS_media__root /var/lib/aleksis/media
ENV
ALEKSIS_backup__location /var/lib/aleksis/backups
ENV
ALEKSIS_dev__uwsgi__celery false
ENV
PSQL_PAGER=pspg
# Install necessary Debian and PyPI packages for build and runtime
RUN
apt-get
-y
update
&&
\
...
...
@@ -28,11 +29,15 @@ RUN apt-get -y update && \
eatmydata apt-get
install
-y
--no-install-recommends
\
build-essential
\
chromium
\
curl
\
dumb-init
\
gettext
\
grep
\
less
\
libpq-dev
\
libssl-dev
\
postgresql-client-14
\
pspg
\
python3-dev
\
python3-magic
\
python3-pip
\
...
...
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