From 3bff499e93f27e597b14861b6587009a6fcb80af Mon Sep 17 00:00:00 2001
From: abraunegg <alex.braunegg@gmail.com>
Date: Fri, 8 Nov 2024 08:13:22 +1100
Subject: [PATCH] Redo PR

* Redo PR
---
 .github/workflows/docker.yaml    |  6 +++---
 contrib/docker/Dockerfile-alpine | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 7849cb6bb..6e2e64811 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -6,9 +6,9 @@ on:
     tags: [ 'v*' ]
   pull_request:
     # Comment these out to force a test build on a PR
-    branches:
-      - master
-    types: [closed]
+    #branches:
+    #  - master
+    #types: [closed]
 
 env:
   DOCKER_HUB_SLUG: driveone/onedrive
diff --git a/contrib/docker/Dockerfile-alpine b/contrib/docker/Dockerfile-alpine
index f06ca3cd2..0dc1ea2d1 100644
--- a/contrib/docker/Dockerfile-alpine
+++ b/contrib/docker/Dockerfile-alpine
@@ -10,24 +10,24 @@ RUN go install -ldflags "-s -w" github.com/tianon/gosu@${GOSU_VERSION}
 
 FROM alpine:${ALPINE_VERSION} AS builder-onedrive
 
-RUN apk add --update --no-cache alpine-sdk gnupg xz curl-dev sqlite-dev binutils-gold autoconf automake ldc
+RUN apk add --update --no-cache libstdc++ dmd curl-dev sqlite-dev make gcc libc-dev gpg-agent gpg bash curl xz git
 
-COPY . /usr/src/onedrive
 WORKDIR /usr/src/onedrive
 
-RUN autoreconf -fiv \
- && ./configure --enable-debug\
- && make clean \
- && make \
- && make install
+RUN set -xv && \
+    git clone https://github.com/abraunegg/onedrive.git && \
+    cd onedrive && \
+    ./configure --enable-debug && \
+    make clean && make && \
+    make install
 
-FROM alpine:${ALPINE_VERSION}
+FROM docker.io/alpine:${ALPINE_VERSION}
 
 RUN apk add --upgrade apk-tools \
  && apk upgrade --available
 
-RUN apk add --update --no-cache bash libcurl libgcc shadow sqlite-libs ldc-runtime  \
- && mkdir -p /onedrive/conf /onedrive/data
+RUN apk add --update --no-cache llvm-libunwind sqlite-libs libcurl bash shadow && \
+    mkdir -p /onedrive/conf /onedrive/data
 
 COPY --from=builder-gosu /go/bin/gosu /usr/local/bin/
 COPY --from=builder-onedrive /usr/local/bin/onedrive /usr/local/bin/