Skip to content

Commit

Permalink
Fixing the docker image.
Browse files Browse the repository at this point in the history
  • Loading branch information
QuinnDamerell committed Jun 28, 2024
1 parent 80b3074 commit 29246e0
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 3 deletions.
57 changes: 57 additions & 0 deletions .github/workflows/docker-build-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Publish Docker image

# Triggers on our test branch for building docker.
on:
push:
branches:
- docker-build

jobs:
push_to_registry:
name: Test Build Docker
runs-on: ubuntu-latest
permissions:
packages: write
contents: read
# This is needed for the attestation step
id-token: write
attestations: write
steps:
- name: Check out the repo
uses: actions/checkout@v4

# Required for docker multi arch building.
- name: Set up QEMU
uses: docker/setup-qemu-action@v3

# Required for docker multi arch building.
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Log in to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: octoeverywhere/octoeverywhere
tags: |
# set latest tag
type=raw,value=latest
# set versioned tag
type=semver,pattern={{version}}
- name: Build and push Docker image
id: push
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm/v7,linux/arm64
file: ./Dockerfile
push: false
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ ENV DATA_DIR=/data/

# Install the required packages.
# Any packages here should be mirrored in the install script - and any optaionl pillow packages done inline.
# GCC, python3-dev, and musl-dev are required for pillow, and jpeg-dev and zlib-dev are required for jpeg support.
RUN apk add --no-cache curl ffmpeg jq python3 python3-dev gcc musl-dev py3-pip py3-virtualenv jpeg-dev libjpeg-turbo-dev zlib-dev py3-pillow
# GCC, python3-dev, and musl-dev are required for pillow, and jpeg-dev and zlib-dev are required for jpeg support. libffi-dev, rust, cargo, pkgconfig libressl-dev are requried to build the PY cryptography lib.
RUN apk add --no-cache curl ffmpeg jq python3 python3-dev gcc musl-dev py3-pip py3-virtualenv jpeg-dev libjpeg-turbo-dev zlib-dev py3-pillow libffi-dev rust cargo pkgconfig libressl-dev

#
# We decided to not run the installer, since the point of the installer is to setup the env, build the launch args, and setup the serivce.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

# The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
# Note that this single version string is used by all of the plugins in OctoEverywhere!
plugin_version = "3.4.2"
plugin_version = "3.4.3"

# The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
# module
Expand Down

0 comments on commit 29246e0

Please sign in to comment.