Skip to content

Commit

Permalink
Merge branch 'main' into renovate/clap-4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Feb 21, 2024
2 parents fa77b99 + 1851033 commit 72226ea
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.odin
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN cargo chef cook --release --recipe-path recipe.json

FROM rust:${RUST_VERSION} as cargo-make

ARG CARGO_MAKE_VERSION=0.37.7
ARG CARGO_MAKE_VERSION=0.37.8

ADD https://github.com/sagiegurari/cargo-make/releases/download/${CARGO_MAKE_VERSION}/cargo-make-v${CARGO_MAKE_VERSION}-x86_64-unknown-linux-gnu.zip /tmp/cargo-make.zip
RUN unzip /tmp/cargo-make.zip -d /tmp \
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.valheim
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ RUN usermod -u ${PUID} steam \
&& chmod 755 /env.sh \
&& chmod 755 /usr/local/bin/odin \
&& dos2unix /entrypoint.sh /home/steam/.bashrc /home/steam/scripts/*.sh \
&& echo "root ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
&& echo "steam ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers


Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
<a href="https://github.com/mbround18/valheim-docker/actions/workflows/docker-release.yml"><img src="https://img.shields.io/github/actions/workflow/status/mbround18/valheim-docker/docker-release.yml?label=Docker&style=for-the-badge" alt=""></a>

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->

[![All Contributors](https://img.shields.io/badge/all_contributors-14-orange.svg?style=flat-square)](#contributors-)

<!-- ALL-CONTRIBUTORS-BADGE:END -->

## Table of Contents
Expand Down
6 changes: 4 additions & 2 deletions src/scripts/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ if [ -f "/home/steam/scripts/utils.sh" ]; then
source "/home/steam/scripts/utils.sh"
fi


# Set up variables
# shellcheck disable=SC2155
export NAME="$(sed -e 's/^"//' -e 's/"$//' <<<"$NAME")"
Expand Down Expand Up @@ -123,9 +122,12 @@ setup_cron() {

setup_filesystem() {
log "Setting up file systems"
STEAM_UID=${PUID:=1000}
STEAM_UID=1000
STEAM_GID=${PGID:=1000}

mkdir -p "/home/steam/.steam/root"
mkdir -p "/home/steam/.steam/steam"

# Save Files
mkdir -p "${SAVE_LOCATION}"

Expand Down

0 comments on commit 72226ea

Please sign in to comment.