🐛 fix(Dockerfile): Create /atheme/etc to avoid permission errors

[skip ci]

.drone.jsonnet

@@ -1,3 +1,5 @@
+local VERSION = "7.2.12";
+
 local build(contrib=false) = {
   "kind": "pipeline",
   "name": "build" + (if contrib then "-contrib" else ""),
@@ -6,17 +8,17 @@ local build(contrib=false) = {
       "name": "set image tags",
       "image": "alpine",
       "environment": {
-        "VERSION": "7.2.10-r2"
+        "VERSION": VERSION
       },
       "commands": [
-        "./write-tags.sh $VERSION contrib > .tags",
+        "./write-tags.sh $VERSION" + (if contrib then " contrib" else " ") + "> .tags",
         "# Will build the following tags:",
         "cat .tags"
       ]
     },
     {
       "name": "build docker image",
-      "image": "ovdnet/drone-docker",
+      "image": "plugins/docker",
       "settings": {
         "repo": "ovdnet/atheme",
         "username": {
@@ -26,7 +28,7 @@ local build(contrib=false) = {
           "from_secret": "docker_password"
         },
         "build_args": std.prune([
-          "ATHEME_VERSION=7.2.10-r2",
+          "ATHEME_VERSION=" + VERSION,
           (if contrib then "BUILD_CONTRIB_MODULES=true")
         ])
       },
@@ -50,7 +52,8 @@ local build(contrib=false) = {
         "path": "/var/run/docker.sock"
       }
     }
-  ]
+  ],
+  "depends_on": std.prune([if contrib then "build"]),
 };
 
 [

.drone.yml

@@ -1,76 +0,0 @@
----
-kind: pipeline
-name: build
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: set image tags
-  image: alpine
-  commands:
-  - ./write-tags.sh $VERSION contrib > .tags
-  - "# Will build the following tags:"
-  - cat .tags
-  environment:
-    VERSION: 7.2.10-r2
-
-- name: build docker image
-  image: ovdnet/drone-docker
-  settings:
-    build_args:
-    - ATHEME_VERSION=7.2.10-r2
-    password:
-      from_secret: docker_password
-    repo: ovdnet/atheme
-    username:
-      from_secret: docker_user
-  volumes:
-  - name: docker-socket
-    path: /var/run/docker.sock
-
-volumes:
-- name: docker-socket
-  host:
-    path: /var/run/docker.sock
-
----
-kind: pipeline
-name: build-contrib
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: set image tags
-  image: alpine
-  commands:
-  - ./write-tags.sh $VERSION contrib > .tags
-  - "# Will build the following tags:"
-  - cat .tags
-  environment:
-    VERSION: 7.2.10-r2
-
-- name: build docker image
-  image: ovdnet/drone-docker
-  settings:
-    build_args:
-    - ATHEME_VERSION=7.2.10-r2
-    - BUILD_CONTRIB_MODULES=true
-    password:
-      from_secret: docker_password
-    repo: ovdnet/atheme
-    username:
-      from_secret: docker_user
-  volumes:
-  - name: docker-socket
-    path: /var/run/docker.sock
-
-volumes:
-- name: docker-socket
-  host:
-    path: /var/run/docker.sock
-
-...

Dockerfile

@@ -1,11 +1,13 @@
-ARG ATHEME_UID=10000
+ARG ATHEME_UID=1000
-ARG ATHEME_VERSION=7.2.10-r2
+ARG ATHEME_VERSION
 ARG BUILD_CONTRIB_MODULES=
 
 FROM alpine:latest AS builder
 ARG ATHEME_VERSION
 ARG BUILD_CONTRIB_MODULES
 ARG MAKE_NUM_JOBS
+RUN test -n "$ATHEME_VERSION" || (echo "Please set a version to build in build arg ATHEME_VERSION" && false)
+
 RUN mkdir /atheme-src
 
 # Install build-deps and runtime deps
@@ -24,6 +26,9 @@ RUN git clone https://github.com/atheme/atheme -b v${ATHEME_VERSION} --depth=1 a
 RUN cd /atheme-src/libmowgli-2 && \
     git pull origin master
 
+# 2022-02-01: build fix for alpine
+RUN test -z "$BUILD_CONTRIB_MODULES" || sed -i "s/@MKDIR_P@/mkdir -p/g" /atheme-src/modules/contrib/buildsys.mk.in
+
 # Configure and build
 RUN cd /atheme-src && \
     ./configure --prefix=/atheme $(test -z "$BUILD_CONTRIB_MODULES" || echo --enable-contrib) && \
@@ -46,6 +51,8 @@ COPY entrypoint.sh /
 
 RUN adduser -D -h /atheme -u $ATHEME_UID atheme
 RUN chown -R atheme /atheme
+RUN mkdir /atheme/etc
+RUN chown -R atheme /atheme/etc
 USER atheme
 
 # Services config & DB

README.md

@@ -4,6 +4,10 @@
 
 This is an unofficial Docker image for [Atheme IRC Services](https://github.com/atheme/atheme), based off of Alpine and built weekly.
 
+## Maintenance notice
+
+**2022-09 update: This repository is not actively maintained and will NOT be updated past Atheme 7.2.x. If you'd like to take over maintenance with a fork and have it mentioned here, please get in touch with @jlu5.**
+
 ## Usage
 
 First, write your desired `atheme.conf` and copy `services.db` (if you have one) into an empty directory. Make sure it is writable by **UID 10000** (or rebuild the image with your desired UID - see Build Arguments below)
@@ -14,7 +18,7 @@ $ docker run -v /path/to/services/data:/atheme/etc ovdnet/atheme
 
 ### Supported tags
 
-- You can use the `latest` tag (which points to the [latest release built from this repository](/.drone.yml)), or pin to a specific version (e.g. `7.2.10-r2`, `7.2`, `7`)
+- You can use the `latest` tag (which points to the [latest release built from this repository](/.drone.jsonnet)), or pin to a specific version (e.g. `7.2.10-r2`, `7.2`, `7`)
 - Builds with contrib modules are also available: `contrib` (latest release), as well as pins to specific versions (e.g. `7.2.10-r2-contrib`, `7.2-contrib`, `7-contrib`)
 
 ### Sending mail from services