From 0e589141cd39ff74152673e73713f38b43c1a0f4 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Tue, 30 Aug 2022 15:05:30 +0000 Subject: [PATCH] added missing package names to dockerfiles --- codepot/docker/Dockerfile.rocky | 2 +- codepot/docker/Dockerfile.ubnt | 2 +- codepot/docker/Makefile.am | 6 ++++++ codepot/docker/Makefile.in | 6 ++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/codepot/docker/Dockerfile.rocky b/codepot/docker/Dockerfile.rocky index cad2e8a4..ab89bce4 100644 --- a/codepot/docker/Dockerfile.rocky +++ b/codepot/docker/Dockerfile.rocky @@ -48,7 +48,7 @@ RUN \ dnf install -y epel-release && \ dnf install -y --enablerepo=powertools \ subversion subversion-perl \ - httpd php php-gd php-pdo php-ldap \ + httpd php php-gd php-pdo php-ldap php-mbstring php-zip \ perl-Digest-SHA perl-Config-Simple \ perl-DBD-SQLite perl-LDAP perl-Mail-Sendmail perl-Switch \ mod_dav_svn mod_perl diffutils sqlite && \ diff --git a/codepot/docker/Dockerfile.ubnt b/codepot/docker/Dockerfile.ubnt index e671184c..edcfb8fa 100644 --- a/codepot/docker/Dockerfile.ubnt +++ b/codepot/docker/Dockerfile.ubnt @@ -49,7 +49,7 @@ RUN \ apt update && \ DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \ subversion apache2 \ - php libapache2-mod-php php-gd php-sqlite3 php-ldap \ + php libapache2-mod-php php-gd php-sqlite3 php-ldap php-mbstring php-zip \ libapache2-mod-perl2 libapache2-mod-svn \ libswitch-perl libconfig-simple-perl libdigest-sha-perl \ libdbd-sqlite3-perl libnet-ldap-perl libsvn-perl libmail-sendmail-perl sqlite3 vim-tiny && \ diff --git a/codepot/docker/Makefile.am b/codepot/docker/Makefile.am index b53c5e7a..54e96932 100644 --- a/codepot/docker/Makefile.am +++ b/codepot/docker/Makefile.am @@ -17,6 +17,12 @@ ubnt: @srcdir@/codepot-@VERSION@.tar.gz $(DOCKER) build -t codepot:ubnt -f @srcdir@/Dockerfile.ubnt @srcdir@ || true rm -f @srcdir@/codepot-@VERSION@.tar.gz +push: + $(DOCKER) tag codepot:rocky hyunghwan/codepot:rocky + $(DOCKER) tag codepot:ubnt hyunghwan/codepot:ubnt + $(DOCKER) push hyunghwan/codepot:rocky + $(DOCKER) push hyunghwan/codepot:ubnt + @srcdir@/codepot-@VERSION@.tar.gz: cd .. && make dist cp ../codepot-@VERSION@.tar.gz @srcdir@/ diff --git a/codepot/docker/Makefile.in b/codepot/docker/Makefile.in index f5f873d8..d28f7e39 100644 --- a/codepot/docker/Makefile.in +++ b/codepot/docker/Makefile.in @@ -428,6 +428,12 @@ ubnt: @srcdir@/codepot-@VERSION@.tar.gz $(DOCKER) build -t codepot:ubnt -f @srcdir@/Dockerfile.ubnt @srcdir@ || true rm -f @srcdir@/codepot-@VERSION@.tar.gz +push: + $(DOCKER) tag codepot:rocky hyunghwan/codepot:rocky + $(DOCKER) tag codepot:ubnt hyunghwan/codepot:ubnt + $(DOCKER) push hyunghwan/codepot:rocky + $(DOCKER) push hyunghwan/codepot:ubnt + @srcdir@/codepot-@VERSION@.tar.gz: cd .. && make dist cp ../codepot-@VERSION@.tar.gz @srcdir@/