Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFS Gluon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
firmware
FFS Gluon
Commits
251392b0
Unverified
Commit
251392b0
authored
1 year ago
by
David Bauer
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #2975 from freifunk-gluon/docker-uids
Fix Dockerfile / container.sh for UID/GID other than 1000
parents
0db797cd
c8bbef80
No related branches found
Branches containing commit
Tags
experimental-2024-03-08-base
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/docker/Dockerfile
+2
-1
2 additions, 1 deletion
contrib/docker/Dockerfile
scripts/container.sh
+3
-3
3 additions, 3 deletions
scripts/container.sh
with
5 additions
and
4 deletions
contrib/docker/Dockerfile
+
2
−
1
View file @
251392b0
...
...
@@ -21,6 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ecdsautils
\
lua-check
\
shellcheck
\
libnss-unknown
\
&&
apt-get clean
\
&&
rm
-rf
/var/lib/apt/lists/
*
...
...
@@ -30,7 +31,7 @@ RUN mkdir /tmp/ec &&\
mv
bin/ec-linux-amd64 /usr/local/bin/editorconfig-checker
&&
\
rm
-rf
/tmp/ec
RUN
useradd
-d
/gluon gluon
RUN
useradd
-m
-d
/gluon
-u
100
-g
100
-o
gluon
USER
gluon
VOLUME
/gluon
...
...
This diff is collapsed.
Click to expand it.
scripts/container.sh
+
3
−
3
View file @
251392b0
...
...
@@ -12,13 +12,13 @@ TAG="gluon:${BRANCH:-latest}"
if
[
"
$(
command
-v
podman
)
"
]
then
podman build
-t
"
${
TAG
}
"
contrib/docker
podman run
-it
--rm
--userns
=
keep-id
--volume
=
"
$(
pwd
)
:/gluon"
"
${
TAG
}
"
podman run
-it
--rm
-u
"
$(
id
-u
)
:
$(
id
-g
)
"
--userns
=
keep-id
--volume
=
"
$(
pwd
)
:/gluon"
"
${
TAG
}
"
elif
[
"
$(
command
-v
docker
)
"
]
then
docker build
-t
"
${
TAG
}
"
contrib/docker
docker run
-it
--rm
--volume
=
"
$(
pwd
)
:/gluon"
"
${
TAG
}
"
docker run
-it
--rm
-u
"
$(
id
-u
)
:
$(
id
-g
)
"
--volume
=
"
$(
pwd
)
:/gluon"
-e
HOME
=
/gluon
"
${
TAG
}
"
else
1>&2
echo
"Please install either podman or docker. Exiting"
>
/dev/null
echo
"Please install either podman or docker. Exiting"
>
&2
exit
1
fi
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