Compare commits
No commits in common. "b467c414527e818d488c9bc8b945a09fca965a69" and "9ebf8cafbcf035b987d5b880f8714bb0f1407b39" have entirely different histories.
b467c41452
...
9ebf8cafbc
37
.drone.yml
37
.drone.yml
|
@ -1,37 +0,0 @@
|
||||||
kind: pipeline
|
|
||||||
type: docker
|
|
||||||
name: build
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: 'docker_build'
|
|
||||||
image: plugins/docker
|
|
||||||
settings:
|
|
||||||
dry_run: true
|
|
||||||
purge: true
|
|
||||||
|
|
||||||
trigger:
|
|
||||||
event:
|
|
||||||
- pull_request
|
|
||||||
- push
|
|
||||||
|
|
||||||
---
|
|
||||||
kind: pipeline
|
|
||||||
type: docker
|
|
||||||
name: publish
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: 'docker_publish'
|
|
||||||
image: plugins/docker
|
|
||||||
settings:
|
|
||||||
username:
|
|
||||||
from_secret: DOCKER_LOGIN
|
|
||||||
password:
|
|
||||||
from_secret: DOCKER_TOKEN
|
|
||||||
repo:
|
|
||||||
from_secret: DOCKER_REPO
|
|
||||||
tags:
|
|
||||||
- ${DRONE_TAG}
|
|
||||||
- latest
|
|
||||||
trigger:
|
|
||||||
event:
|
|
||||||
- tag
|
|
54
.gitlab-ci.yml
Normal file
54
.gitlab-ci.yml
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
stages:
|
||||||
|
- build
|
||||||
|
- push
|
||||||
|
|
||||||
|
variables:
|
||||||
|
BUILT_IMAGE_TAG: built_image
|
||||||
|
IMAGE_TAG: ${CI_REGISTRY_IMAGE}
|
||||||
|
DOCKER_HUB_IMAGE_TAG: skobkin/murmur
|
||||||
|
DOCKER_HUB_LOGIN: skobkin
|
||||||
|
DOCKER_HUB_TOKEN: "xxx"
|
||||||
|
|
||||||
|
build:
|
||||||
|
# https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2
|
||||||
|
image: docker:23.0.2
|
||||||
|
services:
|
||||||
|
- docker:23.0.2-dind
|
||||||
|
stage: build
|
||||||
|
script:
|
||||||
|
- docker build -t $BUILT_IMAGE_TAG --no-cache .
|
||||||
|
- docker save -o $CI_PROJECT_DIR/images.tar $BUILT_IMAGE_TAG
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- images.tar
|
||||||
|
|
||||||
|
push-gitlab-registry:
|
||||||
|
image: docker:23.0.2
|
||||||
|
services:
|
||||||
|
- docker:23.0.2-dind
|
||||||
|
stage: push
|
||||||
|
only:
|
||||||
|
- tags
|
||||||
|
script:
|
||||||
|
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
||||||
|
- docker load -i images.tar
|
||||||
|
- docker tag $BUILT_IMAGE_TAG $IMAGE_TAG
|
||||||
|
- docker tag $BUILT_IMAGE_TAG $IMAGE_TAG:$CI_COMMIT_TAG
|
||||||
|
- docker push $IMAGE_TAG
|
||||||
|
- docker push $IMAGE_TAG:$CI_COMMIT_TAG
|
||||||
|
|
||||||
|
push-docker-hub-registry:
|
||||||
|
image: docker:23.0.2
|
||||||
|
services:
|
||||||
|
- docker:23.0.2-dind
|
||||||
|
stage: push
|
||||||
|
only:
|
||||||
|
- tags
|
||||||
|
script:
|
||||||
|
- docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_TOKEN
|
||||||
|
- docker load -i images.tar
|
||||||
|
- docker tag $BUILT_IMAGE_TAG $DOCKER_HUB_IMAGE_TAG
|
||||||
|
- docker tag $BUILT_IMAGE_TAG $DOCKER_HUB_IMAGE_TAG:$CI_COMMIT_TAG
|
||||||
|
- docker push $DOCKER_HUB_IMAGE_TAG
|
||||||
|
- docker push $DOCKER_HUB_IMAGE_TAG:$CI_COMMIT_TAG
|
||||||
|
|
|
@ -3,11 +3,11 @@ FROM alpine:3.18 as builder
|
||||||
ARG VERSION=1.5.613
|
ARG VERSION=1.5.613
|
||||||
|
|
||||||
LABEL \
|
LABEL \
|
||||||
org.label-schema.vendor="Alexey Skobkin - skobkin@proton.me" \
|
org.label-schema.vendor="Alexey Skobkin - skobkin-ru@ya.ru" \
|
||||||
org.label-schema.url="https://git.skobk.in/skobkin/docker-murmur" \
|
org.label-schema.url="https://gitlab.com/skobkin/docker-murmur" \
|
||||||
org.label-schema.name="Murmur Server" \
|
org.label-schema.name="Murmur Server" \
|
||||||
org.label-schema.version=$VERSION \
|
org.label-schema.version=$VERSION \
|
||||||
org.label-schema.vcs-url="https://git.skobk.in/skobkin/docker-murmur.git" \
|
org.label-schema.vcs-url="https://gitlab.com/skobkin/docker-murmur.git" \
|
||||||
org.label-schema.license="MIT" \
|
org.label-schema.license="MIT" \
|
||||||
org.label-schema.schema-version="1.0"
|
org.label-schema.schema-version="1.0"
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
# Murmur server docker image
|
# Murmur server docker image
|
||||||
|
|
||||||
[![Build Status](https://ci.skobk.in/api/badges/skobkin/docker-murmur/status.svg)](https://ci.skobk.in/skobkin/docker-murmur)
|
|
||||||
|
|
||||||
## Build
|
## Build
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
|
@ -17,4 +15,4 @@ docker push skobkin/murmur:latest skobkin/murmur:1.4.230
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
See [docker-stacks](https://git.skobk.in/skobkin/docker-stacks).
|
See [skobkin/docker-stacks](https://bitbucket.org/skobkin/docker-stacks/src/master/murmur/).
|
||||||
|
|
Loading…
Reference in a new issue