Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker fixes #19

Merged
merged 12 commits into from
Nov 2, 2023
+12 −8
Merged

Docker fixes #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dd76dfa
Dockerfile: change to debian commands
lskatz Nov 2, 2023
d9406e2
docker.yml: run on docker branch too
lskatz Nov 2, 2023
441e5ce
Dockerfile: update apt-get packages for debian
lskatz Nov 2, 2023
e18a3a6
Dockerfile: linux-headers-amd64
lskatz Nov 2, 2023
f81edbe
Dockefile: apt-get install -y
lskatz Nov 2, 2023
3a5fd09
Dockerfile: Fix order
lskatz Nov 2, 2023
c27891c
Dockerfile: Fix whitespace issue
lskatz Nov 2, 2023
e35e65d
Dockerfile: add tag label
lskatz Nov 2, 2023
abb8e00
Docker.yml: update metadata-action
lskatz Nov 2, 2023
af021ed
Dockerfile: add unit tests
lskatz Nov 2, 2023
7a3b99f
Dockerfile: cargo build debug target
lskatz Nov 2, 2023
229e0b3
Dockerfile: install bc
lskatz Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: Create and publish a Docker image

on:
push:
branches: [master, main]
branches: [master, main, docker]

env:
REGISTRY: ghcr.io
Expand All @@ -33,7 +33,7 @@ jobs:

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

Expand Down
16 changes: 10 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,27 @@ LABEL license="https://github.com/lskatz/fasten/LICENSE"
LABEL maintainer="Lee Katz"
LABEL maintainer.email="[email protected]"
LABEL maintainer2="John Phan"
LABEL tag="${SOFTWARE_VER}"

RUN apk update
RUN apk add --no-cache \
RUN apt-get update
RUN apt-get install -y \
ca-certificates \
build-base \
linux-headers \
linux-headers-amd64 \
git \
openssl-dev \
util-linux-dev \
bc \
libcurl4-openssl-dev \
libseccomp-dev

RUN mkdir -p /usr/src/app \
&& cd /usr/src/app \
&& git clone https://github.com/lskatz/fasten \
&& cd /usr/src/app/fasten \
&& git checkout v${SOFTWARE_VER}
RUN cd /usr/src/app/fasten && cargo build --release

RUN cd /usr/src/app/fasten \
&& cargo build \
&& (set -ex; for i in tests/fasten*.sh; do bash $i; done;)

# build final container

Expand Down
Loading