summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Dockerfile27
-rw-r--r--Makefile7
-rwxr-xr-xfiles/docker-entrypoint.sh (renamed from docker-entrypoint.sh)0
-rwxr-xr-x[-rw-r--r--]files/usr/bin/sx (renamed from sx.sh)0
4 files changed, 19 insertions, 15 deletions
diff --git a/Dockerfile b/Dockerfile
index 8824b53..28ac530 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,14 +2,16 @@ FROM centos:centos7
MAINTAINER Suren A. Chilingaryan
ENV container centos-tools
-
-RUN [ -e /etc/yum.conf ] && sed -i '/tsflags=nodocs/d' /etc/yum.conf || true
-# Reinstall all packages to get man pages for them
-RUN yum -y reinstall "*" && yum clean all
+COPY files/ /
+RUN \
+# Reinstall all packages to get man pages for them
+ [ -e /etc/yum.conf ] && sed -i '/tsflags=nodocs/d' /etc/yum.conf || true; \
+ yum -y reinstall "*" && yum clean all && \
+ \
# Swap out the systemd-container package and install all useful packages
-RUN yum-config-manager -y --add-repo http://ufo.kit.edu/ands/repos/centos74/ && \
+ yum-config-manager -y --add-repo http://ufo.kit.edu/ands/repos/centos74/ && \
yum -y install \
yum-utils glibc-utils bash-completion less file sed findutils net-tools man-db which bc tar \
openssh-clients lftp curl samba-client \
@@ -18,16 +20,11 @@ RUN yum-config-manager -y --add-repo http://ufo.kit.edu/ands/repos/centos74/ &&
mc \
kubernetes-client && \
yum -y --nogpgcheck install NetPIPE \
- && yum clean all
-
-COPY sx.sh /bin/sx
-RUN chmod 775 /bin/sx
+ && yum clean all && \
+ \
+ chmod 775 /bin/sx && \
+ chmod g=u /etc/passwd
-# For ugly applications which want to resolve user name
-RUN chmod g=u /etc/passwd
-
-COPY docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"]
-
-CMD [ "/bin/sx" ]
+CMD [ "/usr/bin/sx" ]
diff --git a/Makefile b/Makefile
index 34badf0..2381328 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,13 @@ rebuild: Dockerfile
push: build
docker push chsa/centos-tools:latest
+login:
+ docker login -u `oc whoami` -p `oc whoami -t` docker-registry-default.kaas.kit.edu
+
+kaas: build login
+ docker tag chsa/centos-tools:latest docker-registry-default.kaas.kit.edu/kaas/kaas-manager:latest
+ docker push docker-registry-default.kaas.kit.edu/kaas/kaas-manager:latest
+
start: build
if [ `docker ps | grep chsa/centos-tools | wc -l` -eq 0 ]; then \
if [ `docker ps -a | grep centos-tools | wc -l` -gt 0 ]; then \
diff --git a/docker-entrypoint.sh b/files/docker-entrypoint.sh
index f4d9f20..f4d9f20 100755
--- a/docker-entrypoint.sh
+++ b/files/docker-entrypoint.sh
diff --git a/sx.sh b/files/usr/bin/sx
index beac660..beac660 100644..100755
--- a/sx.sh
+++ b/files/usr/bin/sx