8000 Merge pull request #3 from ScaleCity/feature/transfer-to-scalecity · solidnerd/docker-bookstack@4ef8834 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4ef8834

Browse files
author
Levi Govaerts
authored
Merge pull request #3 from ScaleCity/feature/transfer-to-scalecity
refactor!: now using registry.scalecity.io
2 parents f826651 + 9a73b0b commit 4ef8834

File tree

12 files changed

+72
-73
lines changed

12 files changed

+72
-73
lines changed

‎.github/workflows/main.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
id: docker_meta_ci
1616
uses: crazy-max/ghaction-docker-meta@v1
1717
with:
18-
images: solidnerd/bookstack-dev
18+
images: registry.scalecity.io/opensource/bookstack-dev
1919
tag-sha: true
2020
- name: Set up Docker Buildx
2121
uses: docker/setup-buildx-action@v1
@@ -29,7 +29,7 @@ jobs:
2929
tags: |
3030
${{ steps.docker_meta_ci.outputs.tags }}
3131
labels: ${{ steps.docker_meta_ci.outputs.labels }}
32-
cache-from: type=registry,ref=solidnerd/bookstack-dev:main
32+
cache-from: type=registry,ref=registry.scalecity.io/opensource/bookstack-dev:main
3333
outputs: type=docker,dest=/tmp/image-bookstack.tar
3434
- name: Upload artifact
3535
uses: actions/upload-artifact@v2
@@ -62,7 +62,7 @@ jobs:
6262
id: docker_meta
6363
uses: crazy-max/ghaction-docker-meta@v1
6464
with:
65-
images: solidnerd/bookstack,ghcr.io/solidnerd/docker-bookstack
65+
images: registry.scalecity.io/opensource/bookstack,registry.scalecity.io/opensource/docker-bookstack
6666
tag-semver: |
6767
{{version}}
6868
{{major}}.{{minor}}
@@ -90,9 +90,9 @@ jobs:
9090
- name: Login to GitHub Container Registry
9191
uses: docker/login-action@v1
9292
with:
93-
registry: ghcr.io
94-
username: ${{ github.repository_owner }}
95-
password: ${{ secrets.CR_PAT }}
93+
registry: registry.scalecity.io
94+
username: ${{ secrets.DOCKER_USERNAME }}
95+
password: ${{ secrets.DOCKER_PASSWORD }}
9696
- name: Build and Push
9797
uses: docker/build-push-action@v2
9898
with:
@@ -103,5 +103,5 @@ jobs:
103103
tags: |
104104
${{ steps.docker_meta.outputs.tags }}
105105
labels: ${{ steps.docker_meta.outputs.labels }}
106-
cache-from: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
107-
cache-to: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
106+
cache-from: type=registry,ref=registry.scalecity.io/opensource/bookstack-dev:${{ github.sha }}
107+
cache-to: type=registry,ref=registry.scalecity.io/opensource/bookstack-dev:${{ github.sha }}

‎.github/workflows/pr.yml

Lines changed: 2 additions & 2 deletions
Original fi 10000 le line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
id: docker_meta_ci
1616
uses: crazy-max/ghaction-docker-meta@v1
1717
with:
18-
images: solidnerd/bookstack-dev
18+
images: registry.scalecity.io/opensource/bookstack-dev
1919
tag-sha: true
2020
- name: Set up Docker Buildx
2121
uses: docker/setup-buildx-action@v1
@@ -29,7 +29,7 @@ jobs:
2929
tags: |
3030
${{ steps.docker_meta_ci.outputs.tags }}
3131
labels: ${{ steps.docker_meta_ci.outputs.labels }}
32-
cache-from: type=registry,ref=solidnerd/bookstack-dev:main
32+
cache-from: type=registry,ref=registry.scalecity.io/opensource/bookstack-dev:main
3333
cache-to: type=inline
3434
outputs: type=docker,dest=/tmp/image-bookstack.tar
3535
- name: Upload artifact

‎.github/workflows/release.yml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
id: docker_meta_ci
1616
uses: crazy-max/ghaction-docker-meta@v1
1717
with:
18-
images: solidnerd/bookstack-dev
18+
images: registry.scalecity.io/opensource/bookstack-dev
1919
tag-sha: true
2020
- name: Set up Docker Buildx
2121
uses: docker/setup-buildx-action@v1
@@ -29,7 +29,7 @@ jobs:
2929
tags: |
3030
${{ steps.docker_meta_ci.outputs.tags }}
3131
labels: ${{ steps.docker_meta_ci.outputs.labels }}
32-
cache-from: type=registry,ref=solidnerd/bookstack-dev:main
32+
cache-from: type=registry,ref=registry.scalecity.io/opensource/bookstack-dev:main
3333
outputs: type=docker,dest=/tmp/image-bookstack.tar
3434
- name: Upload artifact
3535
uses: actions/upload-artifact@v2
@@ -61,7 +61,7 @@ jobs:
6161
id: docker_meta
6262
uses: crazy-max/ghaction-docker-meta@v1
6363
with:
64-
images: solidnerd/bookstack,ghcr.io/solidnerd/docker-bookstack
64+
images: registry.scalecity.io/opensource/bookstack,registry.scalecity.io/opensource/docker-bookstack
6565
tag-semver: |
6666
{{version}}
6767
{{major}}.{{minor}}
@@ -79,18 +79,12 @@ jobs:
7979
uses: docker/setup-qemu-action@v1
8080
- name: Set up Docker Buildx
8181
uses: docker/setup-buildx-action@v1
82-
- name: Login to DockerHub
83-
if: github.event_name != 'pull_request'
82+
- name: Login to ScaleCity.io Container Registry
8483
uses: docker/login-action@v1
8584
with:
86-
username: ${{ secrets.DOCKER_USERNAME }}
87-
password: ${{ secrets.DOCKER_PASSWORD }}
88-
- name: Login to GitHub Container Registry
89-
uses: docker/login-action@v1
90-
with:
91-
registry: ghcr.io
92-
username: ${{ github.repository_owner }}
93-
password: ${{ secrets.CR_PAT }}
85+
registry: registry.scalecity.io
86+
username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
87+
password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
9488
- name: Build and Push main
9589
uses: docker/build-push-action@v2
9690
with:
@@ -101,8 +95,8 @@ jobs:
10195
tags: |
10296
${{ steps.docker_meta.outputs.tags }}
10397
labels: ${{ steps.docker_meta.outputs.labels }}
104-
cache-from: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
105-
cache-to: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
98+
cache-from: type=registry,ref=registry.scalecity.io/opensource/bookstack-dev:${{ github.sha }}
99+
cache-to: type=registry,ref=registry.scalecity.io/opensource/bookstack-dev:${{ github.sha }}
106100
create-release:
107101
runs-on: ubuntu-20.04
108102
needs: push

‎.gitlab-ci.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎.vscode/tasks.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "Build all images",
6+
"type": "shell",
7+
"command": "make build"
8+
},
9+
{
10+
"label": "Pull all images",
11+
"type": "shell",
12+
"command": "make pull"
13+
},
14+
{
15+
"label": "Push dev images",
16+
"type": "shell",
17+
"command": "docker login registry.scalecity.io && make push-dev"
18+
},
19+
{
20+
"label": "Test this repo",
21+
"type": "shell",
22+
"command": "make e2e",
23+
"problemMatcher": []
24+
}
25+
]
26+
}

‎Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM alpine:3 as bookstack
2-
ENV BOOKSTACK_VERSION=21.05.2
2+
ENV BOOKSTACK_VERSION=21.05.3
33
RUN apk add --no-cache curl tar
44
RUN set -x; \
55
curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \
@@ -84,8 +84,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
8484
org.label-schema.docker.dockerfile="/Dockerfile" \
8585
org.label-schema.license="MIT" \
8686
org.label-schema.name="bookstack" \
87-
org.label-schema.vendor="solidnerd" \
88-
org.label-schema.url="https://github.com/solidnerd/docker-bookstack/" \
87+
org.label-schema.vendor="scalecity" \
88+
org.label-schema.url="https://github.com/scalecity/docker-bookstack/" \
8989
org.label-schema.vcs-ref=$VCS_REF \
90-
org.label-schema.vcs-url="https://github.com/solidnerd/docker-bookstack.git" \
90+
org.label-schema.vcs-url="https://github.com/scalecity/docker-bookstack.git" \
9191
org.label-schema.vcs-type="Git"

‎LICENSE

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2020 Niclas Mietz <hi@solidnerd.dev>
3+
Copyright for portions of project solidnerd/docker-bookstack are held by Niclas Mietz <hi@solidnerd.dev> 2020 as part of project scalecity/docker-bookstack. All other copyright for project scalecity/docker-bookstack are held by Levi Govaerts <levi@scalecity.io>.
4+
5+
Copyright (c) 2021
46

57
Permission is hereby granted, free of charge, to any person obtaining a copy
68
of this software and associated documentation files (the "Software"), to deal

‎Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
DOCKER_RELEASE_REG=solidnerd
1+
DOCKER_RELEASE_REG=registry.scalecity.io/opensource
22
DOCKER_IMAGE=bookstack
33
DOCKER_IMAGE_DEV=${DOCKER_IMAGE}-dev
44
DOCKER_INTERNAL_TAG := "sha-$(shell git rev-parse --short HEAD)"
55
DOCKER_RELEASE_TAG := $(shell git describe)
66
BUILD_DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
7-
VCS_URL := https://github.com/solidnerd/docker-bookstack
7+
VCS_URL := https://github.com/scalecity/docker-bookstack
88

99
.PHONY: build push pull release
1010

@@ -13,13 +13,13 @@ build:
1313
-t $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) \
1414
--build-arg VCS_REF=$(DOCKER_INTERNAL_TAG) \
1515
--build-arg BUILD_DATE=$(BUILD_DATE) \
16-
--build-arg VCS_URL=$(VCS_URL)
16+
--build-arg VCS_URL=$(VCS_URL)
1717

1818
push-dev:
1919
docker push $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG)
2020

2121
pull:
22-
docker pull $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG)
22+
docker pull $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG)
2323

2424
release:
2525
docker tag $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):$(DOCKER_RELEASE_TAG)
@@ -30,7 +30,7 @@ push-release:
3030
docker push $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):latest
3131

3232

33-
e2e:
33+
e2e:
3434
@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml up -d
3535
@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml run --rm sut
3636
@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml down -v

‎README.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
# Forked from [solidnerd/docker-bookstack](https://github.com/SolidNerd/docker-bookstack)
2+
3+
* Updated to 21.05.3
4+
15
## Docker Image For [BookStack](https://github.com/ssddanbrown/BookStack)
26

3-
[![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com")
7+
[![Build Status](https://travis-ci.org/scalecity/docker-bookstack.svg?branch=master)](https://travis-ci.org/scalecity/docker-bookstack) [![](https://images.microbadger.com/badges/image/scalecity/bookstack.svg)](https://microbadger.com/images/scalecity/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/scalecity/bookstack.svg)](https://microbadger.com/images/scalecity/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/scalecity/bookstack.svg)](https://microbadger.com/images/scalecity/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/scalecity/bookstack.svg)](https://microbadger.com/images/scalecity/bookstack "Get your own license badge on microbadger.com")
48

5-
## Current Version: [21.05.2](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)
9+
## Current Version: [21.05.3](https://github.com/ScaleCity/docker-bookstack/blob/master/Dockerfile)
610

711
### Changes
812

@@ -21,7 +25,7 @@ and after that open your Browser and go to [http://localhost:8080](http://localh
2125

2226
### Issues
2327

24-
If you have any issues feel free to create an [issue on GitHub](https://github.com/solidnerd/docker-bookstack/issues).
28+
If you have any issues feel free to create an [issue on E377 GitHub](https://github.com/ScaleCity/docker-bookstack/issues).
2529

2630

2731
### How to use the Image without Docker compose
@@ -49,8 +53,8 @@ mysql:5.7.21
4953
```bash
5054
docker run -d --link bookstack_db_:mysql \
5155
-p 8080:8080 \
52-
--name bookstack_21.05.2 \
53-
solidnerd/bookstack:21.05.2
56+
--name bookstack_21.05.3 \
57+
registry.scalecity.io/opensource/bookstack:21.05.3
5458
```
5559

5660
#### Docker 1.9+
@@ -82,8 +86,8 @@ docker run -d --net bookstack_nw \
8286
-e DB_USERNAME=bookstack \
8387
-e DB_PASSWORD=secret \
8488
-p 8080:8080 \
85-
--name="bookstack_21.05.2" \
86-
solidnerd/bookstack:21.05.2
89+
--name="bookstack_21.05.3" \
90+
registry.scalecity.io/opensource/bookstack:21.05.3
8791
```
8892

8993
#### Volumes

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
21.05.2
1+
21.05.3

0 commit comments

Comments
 (0)
0