Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
engine
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
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AURA
engine
Commits
b6b16013
Commit
b6b16013
authored
2 years ago
by
David Trattnig
Browse files
Options
Downloads
Patches
Plain Diff
chore: update to aura UID:GID, see
aura#144
parent
340b1d9a
No related branches found
No related tags found
No related merge requests found
Pipeline
#2884
passed
2 years ago
Stage: test
Stage: release
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+5
-6
5 additions, 6 deletions
Dockerfile
Makefile
+5
-2
5 additions, 2 deletions
Makefile
with
10 additions
and
8 deletions
Dockerfile
+
5
−
6
View file @
b6b16013
...
...
@@ -2,9 +2,8 @@
FROM
python:3.10-slim
as
base
LABEL
maintainer="David Trattnig <david.trattnig@subsquare.at>"
ENV
UID=1000
ENV
GID=1000
ENV
USER=app
ENV
AURA_UID=2872
ENV
AURA_GID=2872
# Configure Poetry
ENV
POETRY_VERSION=1.3.2
...
...
@@ -37,9 +36,9 @@ COPY config/sample.engine.docker.ini /srv/config/engine.ini
RUN
poetry
install
--no-interaction
--no-ansi
# Update Permissions
RUN
set
-e
\
&&
adduser
--home
/srv
--no-create-home
--system
--uid
${
UID
}
--group
${
USER
}
\
&&
chown
-R
${
UID
}
:
${
GID
}
/srv /etc/aura /var/audio
RUN
groupadd
--gid
${
AURA_GID
}
aura
&&
\
useradd
--gid
${
AURA_GID
}
--no-user-group
--uid
${
AURA_UID
}
--home
-dir
/srv
--no-create-home
aura
&&
\
chown
-R
${
AURA_
UID
}
:
${
AURA_
GID
}
/srv /etc/aura /var/audio
ENTRYPOINT
["make"]
CMD
["run"]
This diff is collapsed.
Click to expand it.
Makefile
+
5
−
2
View file @
b6b16013
...
...
@@ -19,12 +19,15 @@ help::
# Settings
TIMEZONE
:=
"Europe/Vienna"
AURA_ENGINE_CORE_SOCKET
:=
"aura_engine_socket"
AURA_ENGINE_CONFIG
:=
${
CURDIR
}
/config/engine.docker.ini
AURA_AUDIO_STORE_SOURCE
:=
${
CURDIR
}
/../engine-core/audio/source
AURA_AUDIO_STORE_PLAYLIST
:=
${
CURDIR
}
/../engine-core/audio/playlist
AURA_LOGS
:=
${
CURDIR
}
/logs
TIMEZONE
:=
"Europe/Vienna"
AURA_UID
:=
2872
AURA_GID
:=
2872
DOCKER_RUN
=
@docker run
\
--name
$(
APP_NAME
)
\
...
...
@@ -36,7 +39,7 @@ DOCKER_RUN = @docker run \
-v
"
$(
AURA_AUDIO_STORE_SOURCE
)
"
:
"/var/audio/source"
:ro
\
-v
"
$(
AURA_AUDIO_STORE_PLAYLIST
)
"
:
"/var/audio/playlist"
:ro
\
-v
"
$(
AURA_LOGS
)
"
:
"/srv/logs"
\
-u
$(
UID
)
:
$(
GID
)
\
-u
$(
AURA_
UID
)
:
$(
AURA_
GID
)
\
$(
DOCKER_ENTRY_POINT
)
\
autoradio/
$(
APP_NAME
)
...
...
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