From d5451f37c616d49ee99ecf558c0bae289dfc7772 Mon Sep 17 00:00:00 2001 From: Joxit Date: Sun, 18 Mar 2018 23:58:36 +0100 Subject: [PATCH] Add debian image version (joxit/docker-registry-ui:debian) --- .dockerignore | 4 ++++ Dockerfile | 4 ++-- Dockerfile.static | 28 +--------------------------- README.md | 23 ++++++++++++++++++----- debian-static.dockerfile | 27 +++++++++++++++++++++++++++ debian.dockerfile | 21 +++++++++++++++++++++ static.dockerfile | 27 +++++++++++++++++++++++++++ 7 files changed, 100 insertions(+), 34 deletions(-) create mode 100644 .dockerignore mode change 100644 => 120000 Dockerfile.static create mode 100644 debian-static.dockerfile create mode 100644 debian.dockerfile create mode 100644 static.dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..186fcec --- /dev/null +++ b/.dockerignore @@ -0,0 +1,4 @@ +* +!dist +!bin +!nginx \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 222c791..e455e61 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Jones Magloire @Joxit +# Copyright (C) 2016-2018 Jones Magloire @Joxit # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -14,7 +14,7 @@ # along with this program. If not, see . FROM nginx:alpine -MAINTAINER Jones MAGLOIRE @Joxit +LABEL maintainer="Jones MAGLOIRE @Joxit" WORKDIR /usr/share/nginx/html/ diff --git a/Dockerfile.static b/Dockerfile.static deleted file mode 100644 index d34e2a5..0000000 --- a/Dockerfile.static +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (C) 2016 Jones Magloire @Joxit -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -FROM nginx:alpine - -MAINTAINER Jones MAGLOIRE @Joxit - -WORKDIR /usr/share/nginx/html/ - -COPY nginx/default.conf /etc/nginx/conf.d/default.conf -COPY dist/ /usr/share/nginx/html/ -COPY dist/scripts/script-static.js /usr/share/nginx/html/scripts/script.js -COPY dist/scripts/tags-static.js /usr/share/nginx/html/scripts/tags.js -COPY bin/entrypoint /bin - -ENTRYPOINT entrypoint diff --git a/Dockerfile.static b/Dockerfile.static new file mode 120000 index 0000000..ae6a841 --- /dev/null +++ b/Dockerfile.static @@ -0,0 +1 @@ +static.dockerfile \ No newline at end of file diff --git a/README.md b/README.md index f79fea3..40a57f2 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ This web user interface uses [Riot](https://github.com/Riot/riot) the react-like - Share your docker registry with query parameter `url` (e.g. `https://joxit.github.io/docker-registry-ui/demo?url=https://registry.example.com`) - Use `joxit/docker-registry-ui:static` as reverse proxy to your docker registry (This will avoid CORS). - Display image size (see #30) +- Alpine and Debian based images ## Getting Started @@ -55,22 +56,34 @@ From sources with this command: ```sh git clone https://github.com/Joxit/docker-registry-ui.git -docker build -t joxit/docker-registry-ui docker-registry-ui -docker build -t joxit/docker-registry-ui -f docker-registry-ui/Dockerfile.static docker-registry-ui +# Alpine +docker build -t joxit/docker-registry-ui:latest docker-registry-ui +docker build -t joxit/docker-registry-ui:static -f docker-registry-ui/static.dockerfile docker-registry-ui +# Debian +docker build -t joxit/docker-registry-ui:debian -f docker-registry-ui/debian.dockerfile docker-registry-ui +docker build -t joxit/docker-registry-ui:static -f docker-registry-ui/debian-static.dockerfile docker-registry-ui ``` Or build with the url: ```sh -docker build -t joxit/docker-registry-ui github.com/Joxit/docker-registry-ui -docker build -t joxit/docker-registry-ui -f Dockerfile.static github.com/Joxit/docker-registry-ui +# Alpine +docker build -t joxit/docker-registry-ui:latest github.com/Joxit/docker-registry-ui +docker build -t joxit/docker-registry-ui:static -f static.dockerfile github.com/Joxit/docker-registry-ui +# Debian +docker build -t joxit/docker-registry-ui:debian -f debian.dockerfile github.com/Joxit/docker-registry-ui +docker build -t joxit/docker-registry-ui:debian-static -f debian-static.dockerfile github.com/Joxit/docker-registry-ui ``` Or pull the image from [docker hub](https://hub.docker.com/r/joxit/docker-registry-ui/): ```sh -docker pull joxit/docker-registry-ui +# Alpine +docker pull joxit/docker-registry-ui:latest docker pull joxit/docker-registry-ui:static +# Debian +docker pull joxit/docker-registry-ui:debian +docker pull joxit/docker-registry-ui:debian-static ``` #### Run the docker diff --git a/debian-static.dockerfile b/debian-static.dockerfile new file mode 100644 index 0000000..bc65c44 --- /dev/null +++ b/debian-static.dockerfile @@ -0,0 +1,27 @@ +# Copyright (C) 2016-2018 Jones Magloire @Joxit +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +FROM nginx:latest + +LABEL maintainer="Jones MAGLOIRE @Joxit" + +WORKDIR /usr/share/nginx/html/ + +COPY nginx/default.conf /etc/nginx/conf.d/default.conf +COPY dist/ /usr/share/nginx/html/ +COPY dist/scripts/script-static.js /usr/share/nginx/html/scripts/script.js +COPY dist/scripts/tags-static.js /usr/share/nginx/html/scripts/tags.js +COPY bin/entrypoint /bin + +ENTRYPOINT entrypoint diff --git a/debian.dockerfile b/debian.dockerfile new file mode 100644 index 0000000..269028e --- /dev/null +++ b/debian.dockerfile @@ -0,0 +1,21 @@ +# Copyright (C) 2016-2018 Jones Magloire @Joxit +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +FROM nginx:latest + +LABEL maintainer="Jones MAGLOIRE @Joxit" + +WORKDIR /usr/share/nginx/html/ + +COPY dist/ /usr/share/nginx/html/ diff --git a/static.dockerfile b/static.dockerfile new file mode 100644 index 0000000..21db25d --- /dev/null +++ b/static.dockerfile @@ -0,0 +1,27 @@ +# Copyright (C) 2016-2018 Jones Magloire @Joxit +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +FROM nginx:alpine + +LABEL maintainer="Jones MAGLOIRE @Joxit" + +WORKDIR /usr/share/nginx/html/ + +COPY nginx/default.conf /etc/nginx/conf.d/default.conf +COPY dist/ /usr/share/nginx/html/ +COPY dist/scripts/script-static.js /usr/share/nginx/html/scripts/script.js +COPY dist/scripts/tags-static.js /usr/share/nginx/html/scripts/tags.js +COPY bin/entrypoint /bin + +ENTRYPOINT entrypoint