Make main Dockerfile

Author: djdefi

.github/workflows/docker-image.yml

@@ -18,8 +18,6 @@ jobs:
       run: docker build . --file Dockerfile --tag backup-utils:${GITHUB_RUN_ID}
     - name: Build the Alpine Docker image
       run: docker build . --file Dockerfile.alpine --tag backup-utils-alpine:${GITHUB_RUN_ID}
-    - name: Build the Rsync source Docker image
-      run: docker build . --file Dockerfile.rsync --tag backup-utils-rsync:${GITHUB_RUN_ID}
     - name: Run tests in Ubuntu Docker image
       run: |
         docker run backup-utils:${GITHUB_RUN_ID} ghe-backup --version
@@ -28,8 +26,3 @@ jobs:
       run: |
         docker run backup-utils-alpine:${GITHUB_RUN_ID} ghe-backup --version
         docker run backup-utils-alpine:${GITHUB_RUN_ID} rsync --version
-    - name: Run tests in Rsync source Docker image
-      run: |
-        docker run backup-utils-rsync:${GITHUB_RUN_ID} ghe-backup --version
-        docker run backup-utils-rsync:${GITHUB_RUN_ID} rsync --version
-      

.github/workflows/rsync-docker-bump.yml

@@ -1,4 +1,4 @@
-name: Update Rsync Tag in Dockerfile.rsync
+name: Update Rsync Tag in Dockerfile
 
 on:
   schedule:
@@ -17,17 +17,17 @@ jobs:
         run: |
           curl --silent "https://api.github.com/repos/WayneD/rsync/tags" | jq -r '.[0].name' | xargs -I {} echo "::set-output name=latest_tag::{}"
 
-      - name: Update Dockerfile.rsync with latest tag
+      - name: Update Dockerfile with latest tag
         run: |
-          sed -i -E "s/RSYNC_TAG=[0-9\.]+/RSYNC_TAG=${{ steps.latest_tag.outputs.latest_tag }}/g" Dockerfile.rsync
+          sed -i -E "s/RSYNC_TAG=[0-9\.]+/RSYNC_TAG=${{ steps.latest_tag.outputs.latest_tag }}/g" Dockerfile
 
       - name: Create Pull Request for tag update
         uses: peter-evans/create-pull-request@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "Update rsync tag in Dockerfile.rsync"
-          title: "Update rsync tag in Dockerfile.rsync"
-          body: "This PR updates the rsync tag in the Dockerfile.rsync to the latest tagged version."
+          commit-message: "Update rsync tag in Dockerfile"
+          title: "Update rsync tag in Dockerfile"
+          body: "This PR updates the rsync tag in the Dockerfile to the latest tagged version."
           branch: "update-rsync-tag"
           base: "master"
           path: "."

Dockerfile

@@ -1,17 +1,71 @@
-FROM ubuntu:focal
+# Multi stage build for backup-utils
+# Build layer is for compiling rsync from source
+# Runtime layer is for running backup-utils
+# https://docs.docker.com/develop/develop-images/multistage-build/
+# https://docs.docker.com/engine/userguide/eng-image/multistage-build/
 
-RUN apt-get -q -y update && \
-    apt-get install -y --no-install-recommends \
+# Build layer
+FROM ubuntu:focal AS build
+
+# Install build dependencies
+RUN apt-get update && apt-get install --no-install-recommends -y \
+    gcc \
+    g++ \
+    gawk \
+    autoconf \
+    make \
+    automake \
+    python3-cmarkgfm \
+    acl \
+    libacl1-dev \
+    attr \
+    libattr1-dev \
+    libxxhash-dev \
+    libzstd-dev \
+    liblz4-dev \
+    libssl-dev \
+    git \
+    jq \
+    curl \
     tar \
-    rsync \
+    gzip \
     ca-certificates \
-    ssh \
+    && rm -rf /var/lib/apt/lists/*
+
+# Download rsync source from https://github.com/WayneD/rsync/archive/refs/tags/[TAG].tar.gz pinned to specified tag
+ARG RSYNC_TAG=v3.2.7
+RUN curl https://github.com/WayneD/rsync/archive/refs/tags/${RSYNC_TAG}.tar.gz -L -o ${RSYNC_TAG}.tar.gz
+RUN mkdir -p /rsync-${RSYNC_TAG}&& tar -xzf ${RSYNC_TAG}.tar.gz -C /rsync-${RSYNC_TAG} --strip-components=1 && ls -la
+# Change to the working directory of the rsync source
+WORKDIR /rsync-${RSYNC_TAG}
+RUN ls -la && ./configure
+RUN make
+RUN make install
+
+# Reset working directory
+WORKDIR /
+
+# Runtime layer
+FROM ubuntu:focal AS runtime
+
+# Install runtime dependencies -  bash, git, OpenSSH 5.6 or newer, and jq v1.5 or newer.
+RUN apt-get update && apt-get install --no-install-recommends -y \
+    bash \
     git \
+    openssh-client \
+    jq \
     moreutils \
-    gawk \
+    gawk \ 
+    ca-certificates \
+    xxhash \
     && rm -rf /var/lib/apt/lists/*
 
+# Copy rsync from build layer
+COPY --from=build /usr/local/bin/rsync /usr/local/bin/rsync
+
+# Copy backup-utils from repository into /backup-utils
 COPY ./ /backup-utils/
+
 WORKDIR /backup-utils
 
 RUN chmod +x /backup-utils/share/github-backup-utils/ghe-docker-init