Skip to content

Commit 2a1b98c

Browse files
authored
Fix/change uid gid and version bump (evryfs#82)
* Change pid/gid to 1001/121 and update virtualenv * Bump version again * Remove runner from tag.sh, now we only tag with virtualenv.
1 parent bf87c99 commit 2a1b98c

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM quay.io/evryfs/base-ubuntu:focal-20210827
22

33
# This the release tag of virtual-environments: https://github.com/actions/virtual-environments/releases
44
ARG UBUNTU_VERSION=2004
5-
ARG VIRTUAL_ENVIRONMENT_VERSION=ubuntu20/20210816.1
5+
ARG VIRTUAL_ENVIRONMENT_VERSION=ubuntu20/20210906.1
66

77
ENV UBUNTU_VERSION=${UBUNTU_VERSION} VIRTUAL_ENVIRONMENT_VERSION=${VIRTUAL_ENVIRONMENT_VERSION}
88

@@ -58,7 +58,7 @@ RUN apt-get -y update && \
5858
rm -rf /virtual-environments /var/cache/apt /var/lib/apt/lists/* /tmp/* /var/tmp/*
5959

6060
# Install runner and its dependencies.
61-
RUN useradd -mr -d /home/runner runner && \
61+
RUN groupadd -g 121 runner && useradd -mr -d /home/runner -u 1001 -g 121 runner && \
6262
install-runner
6363

6464
COPY entrypoint.sh /

tag.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22

3-
RUNNER_VERSION=$(grep "ARG RUNNER_VERSION" -F Dockerfile |cut -d = -f 2)
43
VIRTUAL_ENVIRONMENT_VERSION=$(grep "ARG VIRTUAL_ENVIRONMENT_VERSION" -F Dockerfile| cut -d = -f 2 | sed s/\\//-/)
5-
TAG=${VIRTUAL_ENVIRONMENT_VERSION}-${RUNNER_VERSION}
4+
TAG=${VIRTUAL_ENVIRONMENT_VERSION}
65

76
git tag "${TAG}"

0 commit comments

Comments
 (0)