Skip to content

Commit

Permalink
Merge pull request #23 from exilvm/exilvm/issue10
Browse files Browse the repository at this point in the history
Use a dependecy manager
  • Loading branch information
exil0867 committed Oct 8, 2023
2 parents ba090fe + ad40541 commit 9418cff
Show file tree
Hide file tree
Showing 7 changed files with 605 additions and 38 deletions.
22 changes: 1 addition & 21 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.234.0/containers/python-3/.devcontainer/base.Dockerfile

# [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster
ARG VARIANT="3.10-bullseye"
FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}

# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
ARG NODE_VERSION="none"
RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi

# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image.
# COPY requirements.txt /tmp/pip-tmp/
# RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \
# && rm -rf /tmp/pip-tmp

# [Optional] Uncomment this section to install additional OS packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here>

# [Optional] Uncomment this line to install global node packages.
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
FROM mcr.microsoft.com/devcontainers/python:3.11
14 changes: 3 additions & 11 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,11 @@
"name": "Python 3",
"build": {
"dockerfile": "Dockerfile",
"context": "..",
"args": {
// Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6
// Append -bullseye or -buster to pin to an OS version.
// Use -bullseye variants on local on arm64/Apple Silicon.
"VARIANT": "3.10-bullseye",
// Options
"NODE_VERSION": "lts/*"
}
"context": ".."
},

// Set *default* container specific settings.json values on container create.
"settings": {
"settings": {
"python.defaultInterpreterPath": "/usr/local/bin/python",
"python.linting.enabled": true,
"python.linting.pylintEnabled": true,
Expand All @@ -41,7 +33,7 @@
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "pip3 install --upgrade pip && pip3 install -U discord.py-self python-dotenv",
"postCreateCommand": "curl -sSL https://install.python-poetry.org | python3 - && poetry install",

// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode",
Expand Down
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ updates:
directory: /
schedule:
interval: weekly
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "weekly"
2 changes: 0 additions & 2 deletions .github/workflows/publish-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Create and publish a Docker image

on:
workflow_dispatch:
schedule:
- cron: '0 0 * * 0'
push:
branches: ['master']

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM python:3
FROM python:3.11-bookworm

RUN mkdir /config

VOLUME /config

ADD app.py .

RUN pip install --upgrade pip
RUN curl -sSL https://install.python-poetry.org | python3 -

RUN pip install -U discord.py-self python-dotenv
RUN poetry install

CMD ["python", "./app.py"]
CMD ["python", "./app.py"]
577 changes: 577 additions & 0 deletions poetry.lock

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[tool.poetry]
name = "discordchannelcloner"
version = "1.0.0"
description = ""
authors = ["Exil <[email protected]>"]
readme = "README.md"

[tool.poetry.dependencies]
python = "3.11.6"
"discord.py-self" = "2.0.0"
python-dotenv = "1.0.0"


[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"

0 comments on commit 9418cff

Please sign in to comment.