.drone.yml

@@ -6,22 +6,27 @@ name: build-and-push-develop
 steps:
 
   - name: docker build an publish
-    # https://hub.docker.com/r/library/docker
-    image: hub.docker.struchkov.dev/docker:27.3.1-dind-alpine3.20
+    image: upagge/docker-buildx:latest
     environment:
       DOCKER_REGISTRY_TOKEN:
         from_secret: DOCKER_REGISTRY_TOKEN
+      DOCKER_IMAGE_NAME:
+        from_secret: DOCKER_IMAGE_NAME
       DOCKER_REGISTRY_USER:
         from_secret: DOCKER_REGISTRY_USER
+      STRUCHKOV_DOCKER_IMAGE_NAME:
+        from_secret: STRUCHKOV_DOCKER_IMAGE_NAME
+      STRUCHKOV_DOCKER_REGISTRY_TOKEN:
+        from_secret: STRUCHKOV_DOCKER_REGISTRY_TOKEN
     volumes:
       - name: dockersock
         path: /var/run
     commands:
       - sleep 15
-      - echo "$DOCKER_REGISTRY_TOKEN" | docker login docker.struchkov.dev --username $DOCKER_REGISTRY_USER --password-stdin
-      - echo "$DOCKER_REGISTRY_TOKEN" | docker login hub.docker.struchkov.dev --username $DOCKER_REGISTRY_USER --password-stdin
+      - echo "$DOCKER_REGISTRY_TOKEN" | docker login docker.io --username $DOCKER_REGISTRY_USER --password-stdin
+      - echo "$STRUCHKOV_DOCKER_REGISTRY_TOKEN" | docker login git.struchkov.dev --username $DOCKER_REGISTRY_USER --password-stdin
       - docker buildx create --use
-      - docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t "docker.struchkov.dev/samba:develop" .
+      - docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t "$DOCKER_IMAGE_NAME:develop" -t "git.struchkov.dev/$STRUCHKOV_DOCKER_IMAGE_NAME:develop" .
 
 trigger:
   branch:
@@ -29,8 +34,7 @@ trigger:
 
 services:
   - name: docker
-    # https://hub.docker.com/r/library/docker
-    image: hub.docker.struchkov.dev/docker:27.3.1-dind-alpine3.20
+    image: docker:20.10.22-dind-alpine3.17
     privileged: true
     volumes:
       - name: dockersock
@@ -39,9 +43,6 @@ services:
 volumes:
   - name: dockersock
     temp: {}
-
-image_pull_secrets:
-  - DOCKER_AUTH
 ---
 kind: pipeline
 type: docker
@@ -50,21 +51,27 @@ name: build-and-push-release
 steps:
 
   - name: docker build an publish
-    image: docker.struchkov.dev/docker-buildx:latest
+    image: upagge/docker-buildx:latest
     environment:
       DOCKER_REGISTRY_TOKEN:
         from_secret: DOCKER_REGISTRY_TOKEN
+      DOCKER_IMAGE_NAME:
+        from_secret: DOCKER_IMAGE_NAME
       DOCKER_REGISTRY_USER:
         from_secret: DOCKER_REGISTRY_USER
+      STRUCHKOV_DOCKER_IMAGE_NAME:
+        from_secret: STRUCHKOV_DOCKER_IMAGE_NAME
+      STRUCHKOV_DOCKER_REGISTRY_TOKEN:
+        from_secret: STRUCHKOV_DOCKER_REGISTRY_TOKEN
     volumes:
       - name: dockersock
         path: /var/run
     commands:
       - sleep 15
-      - echo "$DOCKER_REGISTRY_TOKEN" | docker login docker.struchkov.dev --username $DOCKER_REGISTRY_USER --password-stdin
-      - echo "$DOCKER_REGISTRY_TOKEN" | docker login hub.docker.struchkov.dev --username $DOCKER_REGISTRY_USER --password-stdin
+      - echo "$DOCKER_REGISTRY_TOKEN" | docker login docker.io --username $DOCKER_REGISTRY_USER --password-stdin
+      - echo "$STRUCHKOV_DOCKER_REGISTRY_TOKEN" | docker login git.struchkov.dev --username $DOCKER_REGISTRY_USER --password-stdin
       - docker buildx create --use
-      - docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t "docker.struchkov.dev/samba:latest" -t "docker.struchkov.dev/samba:$DRONE_TAG" .
+      - docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t "$DOCKER_IMAGE_NAME:latest" -t "$DOCKER_IMAGE_NAME:$DRONE_TAG" -t "git.struchkov.dev/$STRUCHKOV_DOCKER_IMAGE_NAME:latest" -t "git.struchkov.dev/$STRUCHKOV_DOCKER_IMAGE_NAME:$DRONE_TAG" .
 
 trigger:
   ref:
@@ -72,8 +79,7 @@ trigger:
 
 services:
   - name: docker
-    # https://hub.docker.com/r/library/docker
-    image: hub.docker.struchkov.dev/docker:27.3.1-dind-alpine3.20
+    image: docker:20.10.22-dind-alpine3.17
     privileged: true
     volumes:
       - name: dockersock
@@ -82,13 +88,8 @@ services:
 volumes:
   - name: dockersock
     temp: {}
-
-image_pull_secrets:
-  - DOCKER_AUTH
-
-# drone sign --save DockerFiles/samba
 ---
 kind: signature
-hmac: 741aa984ddc4f94b2b35a8e473a83130545e51598ae64b549083b1fd8b20233a
+hmac: 8cbec230fea28e3ebdaefe0d8d13e9bef855e7cc7207df01f7f7d8b3e80c803d
 
 ...

Dockerfile

@@ -1,4 +1,4 @@
-FROM hub.docker.struchkov.dev/alpine:latest
+FROM alpine:latest
 MAINTAINER Struchkov Mark <mark@struchkov.dev>
 
 # Install samba

docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.4'
 
 services:
   samba:
-    image: docker.struchkov.dev/samba
+    image: upagge/samba
     environment:
       TZ: 'EST5EDT'
     networks: