contrastellar/raid-callouts
1
0
Fork 0
Code Issues 1 Pull Requests Actions Wiki Activity

Compare commits

base: contrastellar:6918f36f1ad0a4942a752e040038179b1098b4c3
Branches Tags
contrastellar:main contrastellar:gabby-dev contrastellar:contributing-edit
..
compare: contrastellar:45401614d55f1e7f79280a39cbd03efd9f59cf9f
Branches Tags
contrastellar:main contrastellar:gabby-dev contrastellar:contributing-edit

3 Commits
6918f36f1a ... 45401614d5

Author SHA1 Message Date
Gabriella Agathon
45401614d5 Update workflows
All checks were successful
Test Helper Module / test (3.11.5) (push) Successful in 29s
Details
2026-02-19 22:05:40 -07:00
Gabriella Agathon
1212821d92 Forgot to add this one 2026-02-19 22:04:09 -07:00
Gabriella Agathon
4bb8c26c6c Edit dockerfiles to use new formula 2026-02-19 22:03:43 -07:00
4 changed files with 29 additions and 73 deletions
Expand all files Collapse all files

18
.github/workflows/deploy.yaml vendored
View File

@@ -16,22 +16,14 @@ jobs:
steps: steps:
- uses: https://github.com/actions/checkout@v4.1.1 - uses: https://github.com/actions/checkout@v4.1.1
- name: Set up conda /w python version 3.11.5
uses: https://github.com/conda-incubator/setup-miniconda@v3.0.2 - name: Setup Poetry
with: uses: Gr1N/setup-poetry@v9
miniconda-version: "latest"
activate-environment: raid-callouts
environment-file: environment.yml
python-version: 3.11.5
- name: Install dependencies - name: Install dependencies
shell: bash -l {0} shell: bash -l {0}
run: | run: |
conda env create --file environment.yml -n test-helper-module poetry instsall
conda init
conda activate test-helper-module
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: add database.ini - name: add database.ini
shell: bash -l {0} shell: bash -l {0}
@@ -44,7 +36,7 @@ jobs:
shell: bash -l {0} shell: bash -l {0}
run: | run: |
conda activate test-helper-module conda activate test-helper-module
python -m pytest src/py/db_helper_tests.py poetry run python -m pytest src/py/db_helper_tests.py
# Checkout the repo, add the dependency files, push to host, build + run (via docker compose up) # Checkout the repo, add the dependency files, push to host, build + run (via docker compose up)
push-and-build: push-and-build:

18
.github/workflows/test.yaml vendored
View File

@@ -22,22 +22,13 @@ jobs:
steps: steps:
- uses: https://github.com/actions/checkout@v4.1.1 - uses: https://github.com/actions/checkout@v4.1.1
- name: Set up conda /w python version 3.11.5 - name: Setup Poetry
uses: https://github.com/conda-incubator/setup-miniconda@v3.0.4 uses: Gr1N/setup-poetry@v9
with:
miniconda-version: "latest"
activate-environment: raid-callouts
environment-file: environment.yml
python-version: 3.11.5
- name: Install dependencies - name: Install dependencies
shell: bash -l {0} shell: bash -l {0}
run: | run: |
conda env create --file environment.yml -n test-helper-module poetry install
conda init
conda activate test-helper-module
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: add database.ini - name: add database.ini
shell: bash -l {0} shell: bash -l {0}
@@ -50,5 +41,4 @@ jobs:
shell: bash -l {0} shell: bash -l {0}
run: | run: |
cd $GITHUB_WORKSPACE cd $GITHUB_WORKSPACE
conda activate test-helper-module poetry run python -m pytest ./src/py/db_helper_tests.py
python -m pytest ./src/py/db_helper_tests.py

33
aux_Dockerfile
View File

@@ -7,7 +7,7 @@
# Want to help us make this template better? Share your feedback here: https://forms.gle/ybq9Krt8jtBL3iCk7 # Want to help us make this template better? Share your feedback here: https://forms.gle/ybq9Krt8jtBL3iCk7
ARG PYTHON_VERSION=3.11.5 ARG PYTHON_VERSION=3.11.5
FROM python:${PYTHON_VERSION}-slim as base FROM ubuntu:latest AS base
# Prevents Python from writing pyc files. # Prevents Python from writing pyc files.
ENV PYTHONDONTWRITEBYTECODE=1 ENV PYTHONDONTWRITEBYTECODE=1
@@ -21,33 +21,20 @@ ENV TZ="America/Detroit"
WORKDIR /app WORKDIR /app
# Create a non-privileged user that the app will run under. # update package list
# See https://docs.docker.com/go/dockerfile-user-best-practices/ RUN apt-get update
ARG UID=10001
RUN adduser \
--disabled-password \
--gecos "" \
--home "/nonexistent" \
--shell "/sbin/nologin" \
--no-create-home \
--uid "${UID}" \
appuser
# Download dependencies as a separate step to take advantage of Docker's caching. # install python, pipx
# Leverage a cache mount to /root/.cache/pip to speed up subsequent builds. RUN apt-get install -y wget python3 pipx
# Leverage a bind mount to requirements.txt to avoid having to copy them into
# into this layer.
RUN --mount=type=cache,target=/root/.cache/pip \
--mount=type=bind,source=requirements.txt,target=requirements.txt \
python -m pip install -r requirements.txt
# Switch to the non-privileged user to run the application.
USER appuser
# Copy the source code into the container. # Copy the source code into the container.
COPY . . COPY . .
# install poetry via pipx
RUN pipx install poetry && pipx ensurepath
RUN ~/.local/bin/poetry install
# Expose the port that the application listens on. # Expose the port that the application listens on.
EXPOSE 8000 EXPOSE 8000
CMD ["python3", "src/py/bot_aux.py", "xiv-database.ini", "xiv-discord.token", "865781604881530940", "888844785274724362"] CMD ~/.local/bin/poetry run python3 src/py/bot_aux.py xiv-database.ini xiv-discord.token 865781604881530940 888844785274724362

33
core_Dockerfile
View File

@@ -7,7 +7,7 @@
# Want to help us make this template better? Share your feedback here: https://forms.gle/ybq9Krt8jtBL3iCk7 # Want to help us make this template better? Share your feedback here: https://forms.gle/ybq9Krt8jtBL3iCk7
ARG PYTHON_VERSION=3.11.5 ARG PYTHON_VERSION=3.11.5
FROM python:${PYTHON_VERSION}-slim as base FROM ubuntu:latest AS base
# Prevents Python from writing pyc files. # Prevents Python from writing pyc files.
ENV PYTHONDONTWRITEBYTECODE=1 ENV PYTHONDONTWRITEBYTECODE=1
@@ -21,33 +21,20 @@ ENV TZ="America/Detroit"
WORKDIR /app WORKDIR /app
# Create a non-privileged user that the app will run under. # update package list
# See https://docs.docker.com/go/dockerfile-user-best-practices/ RUN apt-get update
ARG UID=10001
RUN adduser \
--disabled-password \
--gecos "" \
--home "/nonexistent" \
--shell "/sbin/nologin" \
--no-create-home \
--uid "${UID}" \
appuser
# Download dependencies as a separate step to take advantage of Docker's caching. # install python, pipx
# Leverage a cache mount to /root/.cache/pip to speed up subsequent builds. RUN apt-get install -y wget python3 pipx
# Leverage a bind mount to requirements.txt to avoid having to copy them into
# into this layer.
RUN --mount=type=cache,target=/root/.cache/pip \
--mount=type=bind,source=requirements.txt,target=requirements.txt \
python -m pip install -r requirements.txt
# Switch to the non-privileged user to run the application.
USER appuser
# Copy the source code into the container. # Copy the source code into the container.
COPY . . COPY . .
# install poetry via pipx
RUN pipx install poetry && pipx ensurepath
RUN ~/.local/bin/poetry install
# Expose the port that the application listens on. # Expose the port that the application listens on.
EXPOSE 8000 EXPOSE 8000
CMD ["python3", "src/py/bot_core.py", "xiv-database.ini", "xiv-discord.token", "865781604881530940", "888844785274724362"] CMD ["poetry", "run", "python3", "src/py/bot_core.py", "xiv-database.ini", "xiv-discord.token", "865781604881530940", "888844785274724362"]