From b81ac063d735a9d7a3b3486c26410876fe471e75 Mon Sep 17 00:00:00 2001 From: casjay Date: Sat, 12 Oct 2024 16:20:59 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile .env.scripts README.md --- .env.scripts | 2 +- Dockerfile | 8 ++++---- README.md | 39 +++++++++++++++------------------------ 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/.env.scripts b/.env.scripts index 1ecf733..25aeb98 100644 --- a/.env.scripts +++ b/.env.scripts @@ -4,7 +4,7 @@ # @@Contact : CasjaysDev # @@License : MIT # @@Copyright : Copyright 2024 CasjaysDev -# @@Created : Sun Aug 11 10:50:58 AM EDT 2024 +# @@Created : Sat Oct 12 10:50:58 AM EDT 2024 # @@File : .env.scripts # @@Description : Variables for gen-dockerfile and buildx scripts # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Dockerfile b/Dockerfile index 2a59003..7351616 100644 --- a/Dockerfile +++ b/Dockerfile @@ -231,12 +231,12 @@ LABEL org.opencontainers.image.license="${LICENSE}" LABEL org.opencontainers.image.build-date="${BUILD_DATE}" LABEL org.opencontainers.image.version="${BUILD_VERSION}" LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" -LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/archlinux" -LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/archlinux" +LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/archlinux" +LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/archlinux" LABEL org.opencontainers.image.vcs-type="Git" LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}" -LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/archlinux" -LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/archlinux" +LABEL org.opencontainers.image.vcs-url="https://github.com/dockersrc/archlinux" +LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/archlinux" LABEL com.github.containers.toolbox="false" ENV ENV=~/.bashrc diff --git a/README.md b/README.md index e3ec30d..ea6bc96 100644 --- a/README.md +++ b/README.md @@ -13,25 +13,24 @@ archlinux README ## Automatic install/update ```shell -dockermgr update archlinux +dockermgr update os archlinux ``` ## Install and run container ```shell -mkdir -p "$HOME/.local/share/srv/docker/archlinux/rootfs" +mkdir -p "/var/lib/srv/root/docker/casjaysdev/archlinux/latest" git clone "https://github.com/dockermgr/archlinux" "$HOME/.local/share/CasjaysDev/dockermgr/archlinux" -cp -Rfva "$HOME/.local/share/CasjaysDev/dockermgr/archlinux/rootfs/." "$HOME/.local/share/srv/docker/archlinux/rootfs/" +cp -Rfva "$HOME/.local/share/CasjaysDev/dockermgr/archlinux/rootfs/." "/var/lib/srv/root/docker/casjaysdev/archlinux/latest/" docker run -d \ --restart always \ --privileged \ ---name casjaysdevdocker-archlinux \ +--name casjaysdev-archlinux-latest \ --hostname archlinux \ -e TZ=${TIMEZONE:-America/New_York} \ --v "$HOME/.local/share/srv/docker/casjaysdevdocker-archlinux/rootfs/data:/data:z" \ --v "$HOME/.local/share/srv/docker/casjaysdevdocker-archlinux/rootfs/config:/config:z" \ --p 80:80 \ -casjaysdevdocker/archlinux:latest +-v "/var/lib/srv/root/docker/casjaysdev/archlinux/latest/data:/data:z" \ +-v "/var/lib/srv/root/docker/casjaysdev/archlinux/latest/config:/config:z" \ +casjaysdev/archlinux:latest ``` ## via docker-compose @@ -40,39 +39,31 @@ casjaysdevdocker/archlinux:latest version: "2" services: ProjectName: - image: casjaysdevdocker/archlinux - container_name: casjaysdevdocker-archlinux + image: casjaysdev/archlinux + container_name: casjaysdev-archlinux-latest environment: - TZ=America/New_York - HOSTNAME=archlinux volumes: - - "$HOME/.local/share/srv/docker/casjaysdevdocker-archlinux/rootfs/data:/data:z" - - "$HOME/.local/share/srv/docker/casjaysdevdocker-archlinux/rootfs/config:/config:z" - ports: - - 80:80 + - "/var/lib/srv/root/docker/casjaysdev/archlinux/latest/data:/data:z" + - "/var/lib/srv/root/docker/casjaysdev/archlinux/latest/config:/config:z" restart: always ``` ## Get source files ```shell -dockermgr download src casjaysdevdocker/archlinux -``` - -OR - -```shell -git clone "https://github.com/casjaysdevdocker/archlinux" "$HOME/Projects/github/casjaysdevdocker/archlinux" +dockermgr download src os archlinux ``` ## Build container ```shell -cd "$HOME/Projects/github/casjaysdevdocker/archlinux" -buildx +git clone "https://github.com/dockersrc/archlinux" "$HOME/Projects/github/dockersrc/archlinux" +cd "$HOME/Projects/github/dockersrc/archlinux" && buildx all ``` ## Authors 🤖 casjay: [Github](https://github.com/casjay) 🤖 -⛵ casjaysdevdocker: [Github](https://github.com/casjaysdevdocker) [Docker](https://hub.docker.com/u/casjaysdevdocker) ⛵ +⛵ casjaysdevdocker: [Github](https://github.com/dockersrc) [Docker](https://hub.docker.com/u/casjaysdevdocker) ⛵