mirror of
https://github.com/Joxit/docker-registry-ui.git
synced 2025-04-27 23:50:01 +03:00
ci(1.5.3): push latest tag instead of master in releases and remove multi stage build in favor of GH CI
close #169
This commit is contained in:
parent
b427e09e84
commit
e947d2251d
5 changed files with 13 additions and 33 deletions
6
.github/workflows/main.yml
vendored
6
.github/workflows/main.yml
vendored
|
@ -8,6 +8,10 @@ jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
- name: Install dependencies
|
||||||
|
run: npm install
|
||||||
|
- name: Build the interface
|
||||||
|
run: npm run build
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v1
|
uses: docker/setup-qemu-action@v1
|
||||||
|
@ -28,7 +32,7 @@ jobs:
|
||||||
tags: |
|
tags: |
|
||||||
joxit/docker-registry-ui:master
|
joxit/docker-registry-ui:master
|
||||||
joxit/docker-registry-ui:main
|
joxit/docker-registry-ui:main
|
||||||
- name: Build and push Static version
|
- name: Build and push Static Version
|
||||||
uses: docker/build-push-action@v2
|
uses: docker/build-push-action@v2
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
|
|
8
.github/workflows/release.yml
vendored
8
.github/workflows/release.yml
vendored
|
@ -11,9 +11,9 @@ jobs:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- name: Install
|
- name: Install dependencies
|
||||||
run: npm install
|
run: npm install
|
||||||
- name: Build
|
- name: Build the interface
|
||||||
run: npm run build
|
run: npm run build
|
||||||
- name: Current tag
|
- name: Current tag
|
||||||
id: current-tag
|
id: current-tag
|
||||||
|
@ -50,7 +50,7 @@ jobs:
|
||||||
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
|
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
joxit/docker-registry-ui:master
|
joxit/docker-registry-ui:latest
|
||||||
joxit/docker-registry-ui:${{steps.current-tag.outputs.tag}}
|
joxit/docker-registry-ui:${{steps.current-tag.outputs.tag}}
|
||||||
- name: Build and push Static version
|
- name: Build and push Static version
|
||||||
uses: docker/build-push-action@v2
|
uses: docker/build-push-action@v2
|
||||||
|
@ -60,5 +60,5 @@ jobs:
|
||||||
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
|
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
joxit/docker-registry-ui:master-static
|
joxit/docker-registry-ui:static
|
||||||
joxit/docker-registry-ui:${{steps.current-tag.outputs.tag}}-static
|
joxit/docker-registry-ui:${{steps.current-tag.outputs.tag}}-static
|
14
Dockerfile
14
Dockerfile
|
@ -12,22 +12,10 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
FROM node:10-alpine AS builder
|
|
||||||
|
|
||||||
WORKDIR /usr/app
|
|
||||||
|
|
||||||
COPY package.json .
|
|
||||||
|
|
||||||
RUN yarn install
|
|
||||||
|
|
||||||
COPY . .
|
|
||||||
|
|
||||||
RUN yarn build
|
|
||||||
|
|
||||||
FROM nginx:alpine
|
FROM nginx:alpine
|
||||||
|
|
||||||
LABEL maintainer="Jones MAGLOIRE @Joxit"
|
LABEL maintainer="Jones MAGLOIRE @Joxit"
|
||||||
|
|
||||||
WORKDIR /usr/share/nginx/html/
|
WORKDIR /usr/share/nginx/html/
|
||||||
|
|
||||||
COPY --from=builder /usr/app/dist/ /usr/share/nginx/html/
|
COPY dist/ /usr/share/nginx/html/
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "docker-registry-ui",
|
"name": "docker-registry-ui",
|
||||||
"version": "1.5.2",
|
"version": "1.5.3",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "./node_modules/gulp/bin/gulp.js build",
|
"build": "./node_modules/gulp/bin/gulp.js build",
|
||||||
"build:electron": "npm run build && cd examples/electron && npm install && npm run dist"
|
"build:electron": "npm run build && cd examples/electron && npm install && npm run dist"
|
||||||
|
|
|
@ -12,18 +12,6 @@
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
FROM node:10-alpine AS builder
|
|
||||||
|
|
||||||
WORKDIR /usr/app
|
|
||||||
|
|
||||||
COPY package.json .
|
|
||||||
|
|
||||||
RUN yarn install
|
|
||||||
|
|
||||||
COPY . .
|
|
||||||
|
|
||||||
RUN yarn build
|
|
||||||
|
|
||||||
FROM nginx:alpine
|
FROM nginx:alpine
|
||||||
|
|
||||||
LABEL maintainer="Jones MAGLOIRE @Joxit"
|
LABEL maintainer="Jones MAGLOIRE @Joxit"
|
||||||
|
@ -33,6 +21,6 @@ WORKDIR /usr/share/nginx/html/
|
||||||
ENV NGINX_PROXY_HEADER_Host '$http_host'
|
ENV NGINX_PROXY_HEADER_Host '$http_host'
|
||||||
|
|
||||||
COPY nginx/default.conf /etc/nginx/conf.d/default.conf
|
COPY nginx/default.conf /etc/nginx/conf.d/default.conf
|
||||||
COPY --from=builder /usr/app/dist/ /usr/share/nginx/html/
|
COPY dist/ /usr/share/nginx/html/
|
||||||
COPY --from=builder /usr/app/dist/scripts/docker-registry-ui-static.js /usr/share/nginx/html/scripts/docker-registry-ui.js
|
COPY dist/scripts/docker-registry-ui-static.js /usr/share/nginx/html/scripts/docker-registry-ui.js
|
||||||
COPY bin/entrypoint /docker-entrypoint.d/90-docker-registry-ui.sh
|
COPY bin/entrypoint /docker-entrypoint.d/90-docker-registry-ui.sh
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue