Skip to content

Commit

Permalink
Update Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelGoerentz committed Jun 21, 2024
1 parent cb12e59 commit 04874d2
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ jobs:
buildBinaries:
name: Build and release binaries
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master'
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v4
Expand Down Expand Up @@ -38,8 +37,10 @@ jobs:
buildDockerImages:
name: Build and push Docker Images
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master'
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

Expand Down
16 changes: 9 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# First stage. Building a binary
# -----------------------------------------------------------------------------
FROM golang:alpine AS builder
FROM golang:1.22 AS builder

# Download the source code
RUN apk update && apk add git
RUN apt-get update && apt-get install -y git
RUN git clone https://github.com/marcelGoerentz/Threadfin.git /src

WORKDIR /src
Expand All @@ -16,7 +16,7 @@ RUN go build threadfin.go

# Second stage. Creating an image
# -----------------------------------------------------------------------------
FROM alpine:3.20
FROM ubuntu:22.04

ARG BUILD_DATE
ARG VCS_REF
Expand Down Expand Up @@ -53,14 +53,16 @@ ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$THREADFIN
# Set working directory
WORKDIR $THREADFIN_HOME

RUN apk update && apk upgrade
RUN apk add ca-certificates\
RUN rm /var/lib/dpkg/info/libc-bin.*
RUN apt-get clean
RUN apt-get install libc-bin
RUN apt-get update && apt-get upgrade
RUN apt-get install -y ca-certificates\
curl\
ffmpeg\
vlc

#RUN DEBIAN_FRONTEND=noninteractive TZ="America/New_York" apt-get -y install tzdata
RUN DEBIAN_FRONTEND=noninteractive TZ="America/New_York" apk add tzdata
RUN DEBIAN_FRONTEND=noninteractive TZ="America/New_York" apt-get -y install tzdata

RUN mkdir -p $THREADFIN_BIN

Expand Down

0 comments on commit 04874d2

Please sign in to comment.