diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 4d97d63..dda062b 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,7 +1,9 @@ -FROM rust:1.66 +FROM rust:1.72 ARG USERNAME=lldapdev -ARG USER_UID=1000 +# We need to keep the user as 1001 to match the GitHub runner's UID. +# See https://github.com/actions/checkout/issues/956. +ARG USER_UID=1001 ARG USER_GID=$USER_UID # Create the user @@ -21,4 +23,4 @@ RUN RUSTFLAGS=-Ctarget-feature=-crt-static cargo install wasm-pack \ USER $USERNAME ENV CARGO_HOME=/home/$USERNAME/.cargo -ENV SHELL=/bin/bash \ No newline at end of file +ENV SHELL=/bin/bash diff --git a/.github/workflows/docker-build-static.yml b/.github/workflows/docker-build-static.yml index c2cbc63..a135cb1 100644 --- a/.github/workflows/docker-build-static.yml +++ b/.github/workflows/docker-build-static.yml @@ -30,7 +30,6 @@ env: # build-ui , create/compile the web ### install wasm -### install rollup ### run app/build.sh ### upload artifacts @@ -86,7 +85,7 @@ jobs: needs: pre_job if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.event_name == 'release' }} container: - image: nitnelave/rust-dev:latest + image: lldap/rust-dev:latest steps: - name: Checkout repository uses: actions/checkout@v3.5.3 @@ -101,8 +100,6 @@ jobs: key: lldap-ui-${{ hashFiles('**/Cargo.lock') }} restore-keys: | lldap-ui- - - name: Install rollup (nodejs) - run: npm install -g rollup - name: Add wasm target (rust) run: rustup target add wasm32-unknown-unknown - name: Install wasm-pack with cargo