Merge pull request #8 from suda/chore/update-base-image

Update base image to Alpine 3.17.1 and Python to 3

Author: suda

.github/workflows/docker-image.yml

@@ -1,24 +1,3 @@
-name: Docker Image CI
-
-on:
-  push:
-    tags:
-    - '*'
-  pull_request:
-    branches: [ "main" ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Build the Docker image
-      env:
-        IMAGE_TAG: ${{ github.sha }}
-      run:
-        docker build . --file Dockerfile.server --tag ghcr.io/suda/dvsync-server:${IMAGE_TAG}
-        docker build . --file Dockerfile.client --tag ghcr.io/suda/dvsync-client:${IMAGE_TAG}
-
 name: Tag Docker Image with Git
 
 on:
@@ -62,15 +41,15 @@ jobs:
     - name: Build and push the server image
       uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
       with:
-        context: Dockerfile.server
+        file: Dockerfile.server
         push: true
         tags: ${{ steps.servermeta.outputs.tags }}
         labels: ${{ steps.servermeta.outputs.labels }}
 
     - name: Build and push the client image
       uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
       with:
-        context: Dockerfile.client
+        file: Dockerfile.client
         push: true
         tags: ${{ steps.clientmeta.outputs.tags }}
         labels: ${{ steps.clientmeta.outputs.labels }}

Dockerfile.client

@@ -1,4 +1,4 @@
-FROM alpine:3.10.2
+FROM alpine:3.17.1
 
 RUN apk add --no-cache rsync openssh \
 	&& apk add --no-cache --virtual .build-deps git openssh \

Dockerfile.server

@@ -1,12 +1,12 @@
-FROM alpine:3.10.2
+FROM alpine:3.17.1
 
-RUN apk add --no-cache python2 py2-pip curl ca-certificates openssh-server rsync \
+RUN apk add --no-cache python3 py3-pip curl ca-certificates openssh-server rsync \
 	&& apk add --no-cache --virtual .build-deps git \
 	&& curl -L -O https://bin.equinox.io/a/jYLcLYYDPtj/ngrok-2.3.17-linux-amd64.zip \
 	&& unzip ngrok-2.3.17-linux-amd64.zip \
 	&& install -v -D ngrok /usr/local/bin/ngrok \
-	&& pip install supervisor \
-	&& pip install git+https://github.com/bendikro/supervisord-dependent-startup.git@v1.1.0 \
+	&& pip install supervisor
+RUN pip install git+https://github.com/suda/supervisord-dependent-startup.git \
 	&& curl -L -O https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \
 	&& install -v -D jq-linux64 /usr/local/bin/jq \
 	&& rm -f ngrok-stable-linux-amd64.zip ngrok jq-linux64 \

README.md

@@ -10,8 +10,6 @@
 
 `dvsync` is a set of two containers running [OpenSSH](https://www.openssh.com/), [ngrok](https://ngrok.com/) and [rsync](https://rsync.samba.org/) that automatically create a secure, encrypted channel between each other and enable easy way to migrate data stored in Docker volumes.
 
-**Client:** [![dvsync-client](https://quay.io/repository/suda/dvsync-client/status "Docker Repository on Quay")](https://quay.io/repository/suda/dvsync-client) **Server:** [![dvsync-client](https://quay.io/repository/suda/dvsync-server/status "Docker Repository on Quay")](https://quay.io/repository/suda/dvsync-server)
-
 <hr />
 
 ![](media/dvsync.gif)
@@ -30,15 +28,15 @@ Here are example ways to run it using [Docker CLI](#docker-cli), [Docker Compose
 ```sh
 docker run --rm -e NGROK_AUTHTOKEN="$NGROK_AUTHTOKEN" \
   --mount source=MY_SOURCE_VOLUME,target=/data,readonly \
-  quay.io/suda/dvsync-server
+  ghcr.io/suda/dvsync-server
 ```
 
 2. Once the server started, look into the logs and copy the `DVSYNC_TOKEN`
 3. Start the client where you want tot copy the data **to**:
 ```sh
 docker run --rm -e DVSYNC_TOKEN="$DVSYNC_TOKEN" \
   --mount source=MY_TARGET_VOLUME,target=/data \
-  quay.io/suda/dvsync-client
+  ghcr.io/suda/dvsync-client
 ```
 
 #### Using local source/target
@@ -47,7 +45,7 @@ Alternatively, if you want to copy this data to your local machine, you can moun
 ```sh
 docker run --rm -e DVSYNC_TOKEN="$DVSYNC_TOKEN" \
   -v $PWD:/data \
-  quay.io/suda/dvsync-client
+  ghcr.io/suda/dvsync-client
 ```
 This can also be done other way around, when you start the server locally if you need to copy local data into the data center.
 
@@ -58,7 +56,7 @@ This can also be done other way around, when you start the server locally if you
 version: '3.6'
 services:
   dvsync-server:
-    image: 'quay.io/suda/dvsync-server'
+    image: 'ghcr.io/suda/dvsync-server'
     environment:
       NGROK_AUTHTOKEN: ${NGROK_AUTHTOKEN}
     volumes:
@@ -76,7 +74,7 @@ volumes:
 version: '3.6'
 services:
   dvsync-server:
-    image: 'quay.io/suda/dvsync-client'
+    image: 'ghcr.io/suda/dvsync-client'
     environment:
       DVSYNC_TOKEN: ${DVSYNC_TOKEN}
     volumes:
@@ -97,7 +95,7 @@ metadata:
   name: dvsync-server
 spec:
   containers:
-  - image: quay.io/suda/dvsync-server
+  - image: ghcr.io/suda/dvsync-server
     name: dvsync-server
     env:
     - name: NGROK_AUTHTOKEN
@@ -117,7 +115,7 @@ metadata:
   name: dvsync-client
 spec:
   containers:
-  - image: quay.io/suda/dvsync-client
+  - image: ghcr.io/suda/dvsync-client
     name: dvsync-client
     env:
     - name: DVSYNC_TOKEN

bin/dvsync-init

@@ -14,4 +14,5 @@ echo -e "\n🔑  Generating client RSA key..."
 ssh-keygen -f ~/.ssh/client_rsa -N '' -q
 cp ~/.ssh/client_rsa.pub ~/.ssh/authorized_keys
 
+echo -e "\n🔐  Setting ngrok auth token..."
 ngrok authtoken ${NGROK_AUTHTOKEN} > /dev/null

etc/supervisord.conf

@@ -21,6 +21,7 @@ supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface
 command=/usr/bin/supervisord-dependent-startup
 autostart=true
 events=PROCESS_STATE
+buffer_size=20
 environment=SUPERVISOR_USERNAME="root",SUPERVISOR_PASSWORD="shibboleet"
 
 [program:dvsync-init]