Skip to content

Adds host's uid and gid as dev user inside Dockerfile.dev image #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nanodirijabl wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Adds host's uid and gid as dev user inside Dockerfile.dev image #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2388d03
Replaces erlang's record tuple w/ json as search vector source
nanodirijabl May 12, 2026
6c11270
Merge branch 'master' into ft/alt-search-vector-formation
nanodirijabl Jun 25, 2026
6453312
XYZ-250: Adds JSONish search vector and storage migrations
nanodirijabl Jun 30, 2026
96fabae
Fixes migration's `badarg` when counting objects
nanodirijabl Jun 30, 2026
9212c4f
Refactors filling migration into bulk insert w/ prepared statement
nanodirijabl Jul 1, 2026
3fb109d
Consolidates migration commands into single module
nanodirijabl Jul 1, 2026
591a2d9
Refactors string to search vector formation
nanodirijabl Jul 6, 2026
1f71ab8
Adds `to_text_search_query` string pre-processing func for search
nanodirijabl Jul 6, 2026
0496bd6
Adds notes to new func
nanodirijabl Jul 6, 2026
121ed2e
Adds use of pre-processed search query w/ testcases
nanodirijabl Jul 7, 2026
9c3204f
Adds host's uid and gid as dev user inside `Dockerfile.dev` image
nanodirijabl Jul 7, 2026
61f13c4
Bumps `cache-version`
nanodirijabl Jul 7, 2026
5b98340
Debug permissions WF
nanodirijabl Jul 7, 2026
a7d8825
Bumps ci wf action
nanodirijabl Jul 7, 2026
5f09223
Bumps ci wf action
nanodirijabl Jul 7, 2026
43e19fd
Adds user uid/gid to compose
nanodirijabl Jul 7, 2026
da87ff6
Bumps ci wf action
nanodirijabl Jul 7, 2026
cc7c4dc
Bumps ci wf action
nanodirijabl Jul 7, 2026
e23bf23
Bumps ci wf
nanodirijabl Jul 9, 2026
619856d
Merge branch 'master' into ft/host-uid-gid-docker-dev
nanodirijabl Jul 9, 2026
f0ea804
Makes use of uid/gid args explicit and passes them thru w/ defaults
nanodirijabl Jul 14, 2026
8c5da58
Bumps CI action to v2
nanodirijabl Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/erlang-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ jobs:
run:
name: Run checks
needs: setup
uses: valitydev/erlang-workflows/.github/workflows/erlang-parallel-build.yml@v1
uses: valitydev/erlang-workflows/.github/workflows/erlang-parallel-build.yml@v2
with:
otp-version: ${{ needs.setup.outputs.otp-version }}
rebar-version: ${{ needs.setup.outputs.rebar-version }}
use-thrift: true
thrift-version: ${{ needs.setup.outputs.thrift-version }}
run-ct-with-compose: true
upload-coverage: false
cache-version: v4
cache-version: v5
9 changes: 8 additions & 1 deletion Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,16 @@ RUN wget -q -O- "https://github.com/valitydev/thrift/releases/download/${THRIFT_

RUN apt-get update && apt-get install -y cmake

# Setup user for matching permissions in mounted volumes
ARG USER_UID=1000
ARG USER_GID=1000
Comment thread
ttt161 marked this conversation as resolved.
RUN groupadd -g ${USER_GID} dev && \
useradd -m -s /bin/bash -u ${USER_UID} -g ${USER_GID} dev
USER dev

# Set env
ENV CHARSET=UTF-8
ENV LANG=C.UTF-8

# Set runtime
CMD ["/bin/bash"]
CMD ["/bin/bash"]
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ DOTENV := $(shell grep -v '^\#' .env)
# Development images
DEV_IMAGE_TAG = $(TEST_CONTAINER_NAME)-dev
DEV_IMAGE_ID = $(file < .image.dev)
USER_UID:=$(shell id -u)
USER_GID:=$(shell id -g)

DOCKER ?= docker
DOCKERCOMPOSE ?= docker compose
DOCKERCOMPOSE_W_ENV = DEV_IMAGE_TAG=$(DEV_IMAGE_TAG) $(DOCKERCOMPOSE) -f compose.yaml -f compose.tracing.yaml
DOCKERCOMPOSE_W_ENV = USER_UID=$(USER_UID) USER_GID=$(USER_GID) DEV_IMAGE_TAG=$(DEV_IMAGE_TAG) $(DOCKERCOMPOSE) -f compose.yaml -f compose.tracing.yaml
REBAR ?= rebar3
TEST_CONTAINER_NAME ?= testrunner

Expand Down Expand Up @@ -51,7 +53,7 @@ wc-%: dev-image
$(DOCKER_RUN) $(DEV_IMAGE_TAG) make $*

wdeps-shell: dev-image
$(DOCKERCOMPOSE_RUN) $(TEST_CONTAINER_NAME) su; \
$(DOCKERCOMPOSE_RUN) $(TEST_CONTAINER_NAME) bash; \
$(DOCKERCOMPOSE_W_ENV) down

wdeps-%: dev-image
Expand Down
3 changes: 3 additions & 0 deletions compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ services:
args:
OTP_VERSION: $OTP_VERSION
THRIFT_VERSION: $THRIFT_VERSION
USER_UID: $USER_UID
USER_GID: $USER_GID
user: "${USER_UID:-1000}:${USER_GID:-1000}"
volumes:
- .:$PWD
hostname: dmt.default
Expand Down
Loading