From d71808795dd93d98b5e6c8ced7fbeffc837c29bc Mon Sep 17 00:00:00 2001
From: Matthew <mrhowel@g.clemson.edu>
Date: Mon, 19 Jun 2023 19:11:52 -0400
Subject: [PATCH] Change name to cron-socat. Remove build-args.

---
 .github/workflows/gitlab-push.yml |  4 ++--
 .github/workflows/publish.yml     |  5 ++---
 Dockerfile                        |  4 +---
 README.md                         | 14 +++++++-------
 dev_build.sh                      |  2 +-
 entrypoint.sh                     |  2 +-
 6 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/gitlab-push.yml b/.github/workflows/gitlab-push.yml
index 87431b3..72daeae 100644
--- a/.github/workflows/gitlab-push.yml
+++ b/.github/workflows/gitlab-push.yml
@@ -17,7 +17,7 @@ jobs:
       run: |
         git config --global user.name "Github Actions"
         git config --global user.email "11matt556@users.noreply.github.com"
-        git remote set-url origin "https://oauth2:${{ secrets.GITLAB_PROJECT_TOKEN }}@gitlab.com/11matt556/docker-cron.git"
-        git remote add old https://github.com/11matt556/socat-cron.git
+        git remote set-url origin "https://oauth2:${{ secrets.GITLAB_PROJECT_TOKEN }}@gitlab.com/11matt556/cron-socat.git"
+        git remote add old https://github.com/11matt556/cron-socat.git
         git fetch --unshallow old
         git push origin master --force
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index ed796e9..dffb986 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -4,8 +4,8 @@ on:
     types: [published]
     
 env:
-  DOCKER_HUB: docker.io/11matt556/socat-cron
-  GITHUB_CONTAINER: ghcr.io/11matt556/socat-cron
+  DOCKER_HUB: docker.io/11matt556/cron-socat
+  GITHUB_CONTAINER: ghcr.io/11matt556/cron-socat
   
 jobs:
   push_to_registries:
@@ -49,4 +49,3 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          build-args: alpine_socat_version=${{ github.ref_name }}
diff --git a/Dockerfile b/Dockerfile
index 1576f49..8f23be7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,4 @@
-ARG alpine_socat_version
-
-FROM alpine/socat:${alpine_socat_version}
+FROM alpine/socat:1.7.4.4
 
 # Create Crontab directories
 RUN mkdir /etc/periodic/1min \
diff --git a/README.md b/README.md
index 75fcddb..9de7b48 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Publish Docker Image](https://github.com/11matt556/socat-cron/actions/workflows/publish.yml/badge.svg?event=release)](https://github.com/11matt556/socat-cron/actions/workflows/publish.yml)
 [![Push changes to Gitlab](https://github.com/11matt556/socat-cron/actions/workflows/gitlab-push.yml/badge.svg?event=push)](https://github.com/11matt556/socat-cron/actions/workflows/gitlab-push.yml)
 
-# Socat-Cron
+# cron-socat
 Forked from djpic's [docker-images](https://gitlab.com/djpic/docker-images) project on Gitlab. 
 
 Removed non-cron items, modified to use alpine/socat instead of alpine, removed fastcgi, and switched CI/CD to Github Actions. 
@@ -9,12 +9,12 @@ Removed non-cron items, modified to use alpine/socat instead of alpine, removed
 My purpose for this is as a simple scheduler for docker container actions without Docker Swarm or k8s. The idea is to pass through docker.sock and communicate with the socket with socat to control containers on the host. 
 
 ## Source Repo
-* [Github](https://github.com/11matt556/socat-cron)
-* [Gitlab (mirror)](https://gitlab.com/11matt556/docker-cron)
+* [Github](https://github.com/11matt556/cron-socat)
+* [Gitlab (mirror)](https://gitlab.com/11matt556/cron-socat)
 
 ## Docker Image
-* [GHCR](https://github.com/11matt556/socat-cron/pkgs/container/socat-cron)
-* [Dockerhub](https://hub.docker.com/r/11matt556/socat-cron) 
+* [GHCR](https://github.com/11matt556/socat-cron/pkgs/container/cron-socat)
+* [Dockerhub](https://hub.docker.com/r/11matt556/cron-socat) 
 
 # How to use
 Mount script(s) into the directories below to run them at the associated interval:
@@ -45,8 +45,8 @@ services:
 
 # CI/CD
 This project uses Github actions for the following:
-* Mirror from [GitHub](https://github.com/11matt556/socat-cron) to [GitLab](https://gitlab.com/11matt556/docker-cron)
-* Publish Github releases to [GHCR](https://github.com/11matt556/socat-cron/pkgs/container/socat-cron) and [Dockerhub](https://hub.docker.com/r/11matt556/socat-cron) 
+* Mirror from [GitHub](https://github.com/11matt556/cron-socat) to [GitLab](https://gitlab.com/11matt556/cron-socat)
+* Publish Github releases to [GHCR](https://github.com/11matt556/socat-cron/pkgs/container/cron-socat) and [Dockerhub](https://hub.docker.com/r/11matt556/cron-socat).
 
 # Credits
 * https://hub.docker.com/r/djpic/cron
diff --git a/dev_build.sh b/dev_build.sh
index 2754838..c444393 100755
--- a/dev_build.sh
+++ b/dev_build.sh
@@ -1 +1 @@
-docker build --build-arg alpine_socat_version=latest --tag 11matt556/socat-cron:dev .
+docker build --build-arg alpine_socat_version=latest --tag 11matt556/cron-socat:dev .
diff --git a/entrypoint.sh b/entrypoint.sh
index 29b52b3..12a1d85 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 echo "Based on https://hub.docker.com/repository/docker/djpic/cron"
-echo "For more information: https://github.com/11matt556/socat-cron"
+echo "For more information: https://github.com/11matt556/cron-socat"
 echo "Starting Docker Container..."
 
 crond -f -l 8 -d 8 -L /dev/stdout