Skip to content
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

change > to >> #16

Open
wants to merge 8 commits into
base: release/v3.3.4
Choose a base branch
from
Open

change > to >> #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4f7e376
Update 04-update-crontabs
sukeyisme Dec 8, 2024
05e5bf4
Update Dockerfile
sukeyisme Dec 8, 2024
21d75d8
Update Dockerfile
sukeyisme Dec 8, 2024
ea7e74f
Update Dockerfile
sukeyisme Dec 8, 2024
e355763
Update Dockerfile
sukeyisme Dec 8, 2024
489507b
Update Dockerfile
sukeyisme Dec 8, 2024
bba1971
Update Dockerfile
sukeyisme Dec 8, 2024
7279346
Update Dockerfile
sukeyisme Dec 8, 2024
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
7 changes: 3 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#

# Set python image version
ARG PYTHON_VERSION=3.10-alpine3.15
ARG PYTHON_VERSION=3.10-alpine3.18

# Set vars for s6 overlay
ARG S6_OVERLAY_VERSION=v2.2.0.3
Expand Down Expand Up @@ -69,7 +69,6 @@ RUN \
git \
build-base \
libusb-dev \
libressl-dev \
libffi-dev \
curl-dev \
jpeg-dev \
Expand All @@ -94,12 +93,12 @@ RUN \
sed -i '/qt-range-slider/d' requirements.txt && \
echo "Fixing markupsafe issue..." && \
echo "markupsafe==2.0.1" >> requirements.txt && \
echo "Upgrading pip..." && \
pip3 install --upgrade pip && \
echo "Setup venv..." && \
pip3 install virtualenv && \
python3 -m venv venv && \
source venv/bin/activate && \
echo "Upgrading pip..." && \
pip3 install --upgrade pip && \
echo "Building wheels for requirements..." && \
pip3 install -r requirements.txt && \
echo "Creating volume directories..." && \
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/cont-init.d/04-update-crontabs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ if [[ "$EXECUTE_CRON" = "true" ]] && [[ -f "${USERS_CONF}" ]]; then
schedule=$(echo "${row}" | jq -r 'to_entries|map("\(.value|tostring)")|.[]')

echo "Found schedule for command ${cmd}: ${schedule}"
echo "${schedule} /usr/local/bin/nut-api -a \"${CRONTAB_USER}\" -c \"${cmd}\"" >/etc/crontabs/root
echo "${schedule} /usr/local/bin/nut-api -a \"${CRONTAB_USER}\" -c \"${cmd}\"" >> /etc/crontabs/root
echo "Added ${cmd} schedule to /etc/crontabs/root..."
done
else
Expand Down