Skip to content

Commit

Permalink
Revert "Fix Dockerfiles + CI job for building and uploading docker im…
Browse files Browse the repository at this point in the history
…ages (#22)"

This reverts commit 7337786.
  • Loading branch information
r3dlight committed Jan 9, 2025
1 parent 7337786 commit 99d2708
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 55 deletions.
32 changes: 0 additions & 32 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,3 @@ jobs:
bin: diode-send,diode-receive,diode-send-file,diode-receive-file
archive: lidi-$tag
token: ${{ secrets.GITHUB_TOKEN }}
build-and-push-docker-image:
name: Builds and pushes a tagged docker image
runs-on: ubuntu-latest
strategy:
matrix:
lidi_service:
- send
- receive
steps:
- uses: actions/checkout@v4
- uses: docker/login-action@v3
with:
registry: docker.io
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- uses: docker/metadata-action@v5
id: docker_meta
with:
images: docker.io/anssi/lidi-${{ matrix.lidi_service }}
tags: |
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
- uses: docker/build-push-action@v5
with:
context: .
push: true
target: ${{ matrix.lidi_service }}
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}


19 changes: 0 additions & 19 deletions Dockerfile

This file was deleted.

8 changes: 8 additions & 0 deletions Dockerfile.receive
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM rust:latest AS builder
WORKDIR /usr/src/lidi
COPY . .
RUN cargo install --path .

FROM debian:buster-slim
COPY --from=builder /usr/local/cargo/bin/diode-receive /usr/local/bin
ENTRYPOINT ["diode-receive"]
8 changes: 8 additions & 0 deletions Dockerfile.send
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM rust:latest AS builder
WORKDIR /usr/src/lidi
COPY . .
RUN cargo install --path .

FROM debian:buster-slim
COPY --from=builder /usr/local/cargo/bin/diode-send /usr/local/bin
ENTRYPOINT ["diode-send"]
6 changes: 2 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ services:
image: diode:send
build:
context: .
dockerfile: Dockerfile
target: send
dockerfile: Dockerfile.send
networks:
diode_net:
ipv4_address: 172.16.0.2
Expand All @@ -32,8 +31,7 @@ services:
image: diode:receive
build:
context: .
dockerfile: Dockerfile
target: receive
dockerfile: Dockerfile.receive
networks:
diode_net:
ipv4_address: 172.16.0.3
Expand Down

0 comments on commit 99d2708

Please sign in to comment.