Skip to content

Commit

Permalink
chore: removes Docker Hub build
Browse files Browse the repository at this point in the history
Signed-off-by: Pedro Lamas <[email protected]>
  • Loading branch information
pedrolamas committed Mar 16, 2023
1 parent 2f76326 commit 13733ff
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 128 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
type=semver,pattern={{raw}}
type=ref,event=pr
type=sha,format=long
type=raw,value=latest-dev,enable=${{ github.ref == 'refs/heads/develop' }}
type=raw,value=latest-develop,enable=${{ github.ref == 'refs/heads/develop' }}
type=raw,value=latest-master,enable=${{ github.ref == 'refs/heads/master' }}
- name: Set up QEMU
Expand All @@ -96,7 +96,7 @@ jobs:
uses: docker/build-push-action@v3
with:
context: .
file: ./Dockerfile.new
file: ./Dockerfile
platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
push: true
tags: ${{ steps.docker_meta.outputs.tags }}
Expand Down
63 changes: 0 additions & 63 deletions .github/workflows/multiarch_dockerhub.yml

This file was deleted.

18 changes: 3 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
FROM alpine:latest as unzip

ARG FRONTEND_ZIP_URL=https://github.com/fluidd-core/fluidd/releases/latest/download/fluidd.zip

WORKDIR /frontend

ADD ${FRONTEND_ZIP_URL} /tmp/frontend.zip
RUN unzip /tmp/frontend.zip -d /frontend

FROM nginx:alpine

ENV JPEG_STREAM_HOST localhost
ENV JPEG_STREAM_PORT 8080
ENV PORT=80

COPY --chown=101:101 server/nginx-site.conf /etc/nginx/conf.d/default.conf
COPY --from=unzip --chown=101:101 /frontend /usr/share/nginx/html
COPY --chown=101:101 server/config.json /usr/share/nginx/html/config.json
EXPOSE 80
COPY /dist /usr/share/nginx/html
COPY /server/nginx /etc/nginx/templates
6 changes: 0 additions & 6 deletions Dockerfile.new

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Older releases can be found [here](https://github.com/fluidd-core/fluidd/release

## Docker

We have an [official docker image](https://hub.docker.com/r/cadriel/fluidd). This is updated for each release.
We have an [official docker image](https://github.com/fluidd-core/fluidd/pkgs/container/fluidd). This is updated for each release and on each commit.

## How to use?

Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ printer communities and you, the user.
## Docker

Fluidd ships with Docker support built in. The official docker can be found
[here](https://hub.docker.com/r/cadriel/fluidd), and further information can be found [here](/installation/docker).
[here](https://github.com/fluidd-core/fluidd/pkgs/container/fluidd), and further information can be found [here](/installation/docker).

## Support

Expand Down
13 changes: 11 additions & 2 deletions docs/installation/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ Fluidd can be hosted with Docker. This is considered an advanced install, but
gives you the benefit of hosting a single instance of Fluidd, and having it
connect to multiple printers.

The container is updated automatically with each release of Fluidd.
The docker image is updated automatically with each release of Fluidd, and
on each commit to the "master" or "develop" branches.

[View on Docker Hub](https://hub.docker.com/r/cadriel/fluidd){: .btn .fs-5 .mb-4 .mb-md-0 }
This is a list of the available docker image tags:

- `latest`: points to the most recent release
- `v*.*.*`: points to a specific release
- `latest-master`: points to the most recent commit to the "master" branch
- `latest-develop`: points to the most recent commit to the "develop" branch
- `sha-<hash>`: points to a specific git commit hash

[View on GitHub Container registry](https://github.com/fluidd-core/fluidd/pkgs/container/fluidd){: .btn .fs-5 .mb-4 .mb-md-0 }
38 changes: 0 additions & 38 deletions server/nginx-site.conf

This file was deleted.

0 comments on commit 13733ff

Please sign in to comment.