Skip to content

Commit

Permalink
ci(1.5.3): push latest tag instead of master in releases and remove m…
Browse files Browse the repository at this point in the history
…ulti stage build in favor of GH CI

close #169
  • Loading branch information
Joxit committed Feb 9, 2021
1 parent b427e09 commit e947d22
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 33 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Install dependencies
run: npm install
- name: Build the interface
run: npm run build
- uses: actions/checkout@v2
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
Expand All @@ -28,7 +32,7 @@ jobs:
tags: |
joxit/docker-registry-ui:master
joxit/docker-registry-ui:main
- name: Build and push Static version
- name: Build and push Static Version
uses: docker/build-push-action@v2
with:
context: .
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Install
- name: Install dependencies
run: npm install
- name: Build
- name: Build the interface
run: npm run build
- name: Current tag
id: current-tag
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
push: true
tags: |
joxit/docker-registry-ui:master
joxit/docker-registry-ui:latest
joxit/docker-registry-ui:${{steps.current-tag.outputs.tag}}
- name: Build and push Static version
uses: docker/build-push-action@v2
Expand All @@ -60,5 +60,5 @@ jobs:
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
push: true
tags: |
joxit/docker-registry-ui:master-static
joxit/docker-registry-ui:static
joxit/docker-registry-ui:${{steps.current-tag.outputs.tag}}-static
14 changes: 1 addition & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,10 @@
#
# 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/>.
FROM node:10-alpine AS builder

WORKDIR /usr/app

COPY package.json .

RUN yarn install

COPY . .

RUN yarn build

FROM nginx:alpine

LABEL maintainer="Jones MAGLOIRE @Joxit"

WORKDIR /usr/share/nginx/html/

COPY --from=builder /usr/app/dist/ /usr/share/nginx/html/
COPY dist/ /usr/share/nginx/html/
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "docker-registry-ui",
"version": "1.5.2",
"version": "1.5.3",
"scripts": {
"build": "./node_modules/gulp/bin/gulp.js build",
"build:electron": "npm run build && cd examples/electron && npm install && npm run dist"
Expand Down
16 changes: 2 additions & 14 deletions static.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,6 @@
#
# 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/>.
FROM node:10-alpine AS builder

WORKDIR /usr/app

COPY package.json .

RUN yarn install

COPY . .

RUN yarn build

FROM nginx:alpine

LABEL maintainer="Jones MAGLOIRE @Joxit"
Expand All @@ -33,6 +21,6 @@ WORKDIR /usr/share/nginx/html/
ENV NGINX_PROXY_HEADER_Host '$http_host'

COPY nginx/default.conf /etc/nginx/conf.d/default.conf
COPY --from=builder /usr/app/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/ /usr/share/nginx/html/
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

0 comments on commit e947d22

Please sign in to comment.