diff --git a/README.md b/README.md index 5e1c330..0184cb1 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ ## types -- binary: hotspot, openj9, zulu, nexus, tomcat -- environment: jvms, java, tomcat -- middleware: zk, es, mongo, mysql, redis, kafka, rabbitmq -- support: gitea, nexus, ligvsftp, lighttp -- devops: jenkins, jnlp, docker/buildah, maven, kubectl -- personal: n2n +- [binary](binary/README.md): hotspot, zulu, nexus, tomcat #zulu:alipine-musl +- [environment](environment/README.md)environment: jvms, java, tomcat +- [middleware](middleware/README.md): zk, es, mongo, mysql, redis, kafka, rabbitmq +- [support](support/README.md): gitea, nexus, ligvsftp, lighttp +- [devops](devops/README.md): jenkins, jnlp, docker/buildah, maven, kubectl +- [personal](personal/README.md): n2n diff --git a/binary/README.md b/binary/README.md new file mode 100644 index 0000000..7a7bf6b --- /dev/null +++ b/binary/README.md @@ -0,0 +1,13 @@ +# bindata + +merge aio, with diff tags + +## hotspot, zulu, nexus, tomcat + +- bin-aio:hotsopt-8u202 +- bin-aio:zulu-8u252 +- bin-aio:nexus-v271 +- bin-aio:tomcat-v8.0.51 +- bin-aio: +- bin-aio: +- bin-aio: diff --git a/binary/bin-aio/Dockerfile b/binary/bin-aio/Dockerfile new file mode 100644 index 0000000..9da3830 --- /dev/null +++ b/binary/bin-aio/Dockerfile @@ -0,0 +1,15 @@ +ARG repo=docker.io +FROM ${repo}/infrastlabs/alpine-ext + +ARG url=http://10.1.1.114:680/temp_trans/pro_env +ARG src=jdk-8u162-linux-x64.tar.gz +ARG dest=/down +#/jdk-8u162 + +USER root +RUN wget --user=root --password=root $url/$src \ + && mkdir -p $dest && tar -zxf $src -C $dest \ + && rm -f $src + + + diff --git a/binary/bin-aio/build.sh b/binary/bin-aio/build.sh new file mode 100644 index 0000000..1698175 --- /dev/null +++ b/binary/bin-aio/build.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + + +url=http://10.1.1.114:680/temp_trans/pro_env +dest=/down + +function down(){ + local src=$1 + wget --user=root --password=root $url/$src + mkdir -p $dest && tar -zxf $src -C $dest + rm -f $src +} + +#TODO case > switch($tag) +# hotspot, zulu, nexus, tomcat +src=jdk-8u162-linux-x64.tar.gz +$down $src + +src=zulu-xxx.tar.gz +$down $src + +src=nexus-2.7.1-01-bundle.tar.gz +$down $src + +src=apache-tomcat-8.0.51.tar.gz +$down $src + + +rm -f /build.sh \ No newline at end of file diff --git a/binary/build_img.sh b/binary/build_img.sh new file mode 120000 index 0000000..abca7e4 --- /dev/null +++ b/binary/build_img.sh @@ -0,0 +1 @@ +../build_img.sh \ No newline at end of file diff --git a/build_img.sh b/build_img.sh new file mode 100755 index 0000000..4a4033f --- /dev/null +++ b/build_img.sh @@ -0,0 +1,83 @@ +#!/bin/bash +#setenforce 0 +cur_path=$(cd "$(dirname "$0")"; pwd) #&& echo $cur_path +cmd=$1 && push=$2 && ver=$3 +printf "entry params: [%s, %s, %s]\n" $cmd $push $ver + +source /etc/profile +export |grep DOCKER_REG +# repo=docker.io +repo=registry.cn-shenzhen.aliyuncs.com +echo "${DOCKER_REGISTRY_PW_infrastSubAcc2}" |docker login --username=${DOCKER_REGISTRY_USER_infrastSubAcc2} --password-stdin $repo + +function buildPushImg(){ + local ns=$1 + local image=$2 + local push=$3 + local version=$ver #$4 + + if [ "" = "$version" ]; then + version=latest + fi + + echo ">>>==============={{ "$image" }}>>>build:=========================================" + docker build --pull -t $repo/$namespace/$image:$version --build-arg repo=$repo . + + if [ "push" = "$push" ]; then + echo ">>>==============={{ "$image" }}>>>push:=========================================" + docker push $repo/$namespace/$image:$version + fi + +} + +function doOne(){ + local mod=$1 && local ns=$2 && echo $ns + + #special + array=( + spe-special + ) + echo "${array[@]}" | grep -wq "$mod" && ns="special" + + #default + if [ "" = "$ns" ]; then + ns="infrastlabs" + fi + cd $cur_path/$mod && buildPushImg "$ns" "$mod" "$push" +} + +function callType(){ + local cmd=$1 + case "$cmd" in + env) + doOne env-java8-hotspot + ;; + mid) + doOne mid-elasticsearch + ;; + sup) + doOne sup-nexus #pub + ;; + dvp) + doOne dvp-jenkins + doOne dvp-jnlp + doOne dvp-maven + ;; + all) + doOne bin-aio #ns-binary + + callType bin + callType env + callType mid + callType sup + callType dvp + + #cnt=`expr $cnt + 1` #if [ $cnt -gt 0 ]; then #exit $? + ;; + *) + doOne $cmd + exit $? + ;; + esac +} +callType $cmd diff --git a/devops/build_img.sh b/devops/build_img.sh new file mode 120000 index 0000000..abca7e4 --- /dev/null +++ b/devops/build_img.sh @@ -0,0 +1 @@ +../build_img.sh \ No newline at end of file diff --git a/devops/dvp-maven/Dockerfile b/devops/dvp-maven/Dockerfile new file mode 100644 index 0000000..8a8ee4c --- /dev/null +++ b/devops/dvp-maven/Dockerfile @@ -0,0 +1,13 @@ +ARG repo=docker.io +FROM ${repo}/k-spe/top-jdk-openj9 +MAINTAINER sam + +USER root +RUN mkdir /repository + +ADD *.sh / +RUN sh /build.sh + +##run as root +USER root +WORKDIR / \ No newline at end of file diff --git a/devops/dvp-maven/build.sh b/devops/dvp-maven/build.sh new file mode 100644 index 0000000..84c6ec5 --- /dev/null +++ b/devops/dvp-maven/build.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +MAVEN_VERSION=3.5.4 + +# Add User +useradd -m -d /home/jenkins -s /bin/bash jenkins + +# Install GIT +apk add --no-cache git lftp + +# Install Maven +wget -q http://mirrors.tuna.tsinghua.edu.cn/apache/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz + mkdir /usr/local/soft/maven + tar xzf apache-maven-${MAVEN_VERSION}-bin.tar.gz -C /usr/local/soft/maven + rm apache-maven-${MAVEN_VERSION}-bin.tar.gz +ln -s /usr/local/soft/maven/apache-maven-${MAVEN_VERSION}/bin/mvn /usr/local/bin/mvn + +# Test +mvn -v + +# env +#ln -s /home/jenkins/.netrc /root/.netrc ##/home/jenkins + +#conf +mvn_cnf="/usr/local/soft/maven/apache-maven-${MAVEN_VERSION}/conf" +# mv $mvn_cnf/settings.xml $mvn_cnf/settings.xml00 +# ln -s /somedir/settings.xml $mvn_cnf/settings.xml + +rm -f /build.sh \ No newline at end of file diff --git a/environment/README.md b/environment/README.md new file mode 100644 index 0000000..2b0ac06 --- /dev/null +++ b/environment/README.md @@ -0,0 +1,9 @@ +# list + +- env-java8-hotspot +- env-java8-openj9 +- env-java8-zulu +- env-java8-jvms +- +- env-java8-sboot +- env-java8-tomcat diff --git a/environment/build_img.sh b/environment/build_img.sh new file mode 120000 index 0000000..abca7e4 --- /dev/null +++ b/environment/build_img.sh @@ -0,0 +1 @@ +../build_img.sh \ No newline at end of file diff --git a/environment/env-java8-hotspot/Dockerfile b/environment/env-java8-hotspot/Dockerfile new file mode 100644 index 0000000..7f7b0d2 --- /dev/null +++ b/environment/env-java8-hotspot/Dockerfile @@ -0,0 +1,24 @@ +ARG repo=docker.io +FROM ${repo}/infrastlabs/bin-aio:hotsopt-8u202 +MAINTAINER sam +ARG src=jdk-8u162-linux-x64.tar.gz +ARG dest=/usr/local/soft/java + +USER root +#RUN wget --user=root --password=root http://10.1.1.114:680/temp_trans/pro_env/$src \ +# && mkdir -p $dest && tar -zxf $src -C $dest \ +# && rm -f $src + +ADD *.sh / +RUN sh /build.sh + +##run as root +USER root +WORKDIR / + +ENV JAVA_HOME=$dest/jdk1.8.0_162 \ + PATH="$dest/jdk1.8.0_162/bin:$dest/jdk1.8.0_162/jre/bin:$PATH" + +# +ENV JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap" + diff --git a/environment/env-java8-hotspot/build.sh b/environment/env-java8-hotspot/build.sh new file mode 100644 index 0000000..370e3d7 --- /dev/null +++ b/environment/env-java8-hotspot/build.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash +src=jdk-8u202-linux-x64.tar.gz +dest=/usr/local/soft/java + +#wget --user=root --password=root http://10.1.1.114:680/temp_trans/pro_env/$src +#mkdir -p $dest && tar -zxf $src -C $dest +#rm -f $src + +###ENV +echo "set /etc/profile JAVA_ENV" +cat >>/etc/profile< + +ENV APP_JVM=openj9 +USER root +COPY --from=openj9 /usr/local/soft/java/openjdk /usr/local/soft/java/openjdk +COPY --from=hotspot /usr/local/soft/java/jdk1.8.0_202 /usr/local/soft/java/jdk1.8.0_202 + +ADD *.sh / +RUN sh /build.sh + +##run as root +USER root +WORKDIR / + + diff --git a/environment/env-java8-jvms/build.sh b/environment/env-java8-jvms/build.sh new file mode 100644 index 0000000..e78c35c --- /dev/null +++ b/environment/env-java8-jvms/build.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +cat > /etc/source-openj9 < /etc/source-hotspot <> /etc/profile < + +USER root +COPY --from=openj9 /opt/java/openjdk /usr/local/soft/java/openjdk + +##run as root +USER root +WORKDIR / + +#ENV JAVA_VERSION jdk8u192-b12_openj9-0.11.0 +ENV JAVA_HOME=/usr/local/soft/java/openjdk \ + PATH="/usr/local/soft/java/openjdk/bin:$PATH" +ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+UseContainerSupport -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" +RUN echo "PATH=\$JAVA_HOME/bin:\$PATH" >> /etc/profile \ No newline at end of file diff --git a/environment/env-java8-sboot/Dockerfile b/environment/env-java8-sboot/Dockerfile new file mode 100644 index 0000000..2b25142 --- /dev/null +++ b/environment/env-java8-sboot/Dockerfile @@ -0,0 +1,12 @@ +ARG repo=docker.io +FROM ${repo}/infrastlabs/env-java8-jvms +MAINTAINER sam + +USER root + +ADD *.sh / +RUN sh /build.sh + +##run as www +USER www +WORKDIR / diff --git a/environment/env-java8-sboot/build.sh b/environment/env-java8-sboot/build.sh new file mode 100644 index 0000000..16bb452 --- /dev/null +++ b/environment/env-java8-sboot/build.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +#add user +mkdir -p /data +useradd -m -d /data/www -s /bin/bash www +#gosuctl add www in dtl-app-dockerfile + +#init dir +chown -R www:www /data/www/ +# mkdir -p /opt/appdata /data/www/{app,log} +# chown -R www:www /opt/appdata + +#apollo +# mkdir -p /opt/data && chown www:www -R /opt/data + +rm -f /build.sh \ No newline at end of file diff --git a/environment/env-java8-tomcat/Dockerfile b/environment/env-java8-tomcat/Dockerfile new file mode 100644 index 0000000..44a277f --- /dev/null +++ b/environment/env-java8-tomcat/Dockerfile @@ -0,0 +1,15 @@ +FROM registry.cn-shenzhen.aliyuncs.com/k-pub/app-bindata:bd-tomcat as src + +ARG repo=docker.io +FROM ${repo}/infrastlabs/env-java8-jvms +MAINTAINER sam + +USER root +RUN mkdir -p /data && useradd -m -d /data/www -s /bin/bash www +COPY --chown=www:www --from=src /down/apache-tomcat-8.0.51 /data/www/app +ADD *.sh / +RUN sh /build.sh + +##run as www +USER www +WORKDIR / diff --git a/environment/env-java8-tomcat/build.sh b/environment/env-java8-tomcat/build.sh new file mode 100644 index 0000000..22db1c5 --- /dev/null +++ b/environment/env-java8-tomcat/build.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +dest=/data/www/app + +## before COPY --chown=www:www +#RUN mkdir -p /data && useradd -m -d /data/www -s /bin/bash www + +#bin +rm -f $dest/bin/*.bat +rm -rf $dest/webapps/ROOT/* +rm -rf $dest/webapps/{docs,examples,host-manager,manager} + +#mkdir -p /tmp/zk-cache && chown www:www /tmp/zk-cache +cat > $dest/bin/setenv.sh < +ARG src=jdk-8u162-linux-x64.tar.gz +ARG dest=/usr/local/soft/java + +USER root +#RUN wget --user=root --password=root http://10.1.1.114:680/temp_trans/pro_env/$src \ +# && mkdir -p $dest && tar -zxf $src -C $dest \ +# && rm -f $src + +ADD *.sh / +RUN sh /build.sh + +##run as root +USER root +WORKDIR / + +ENV JAVA_HOME=$dest/jdk1.8.0_162 \ + PATH="$dest/jdk1.8.0_162/bin:$dest/jdk1.8.0_162/jre/bin:$PATH" + +# +ENV JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap" + diff --git a/environment/env-java8-zulu/build.sh b/environment/env-java8-zulu/build.sh new file mode 100644 index 0000000..83f84de --- /dev/null +++ b/environment/env-java8-zulu/build.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash +src=zulu-8u252-linux-x64.tar.gz +dest=/usr/local/soft/java + +#wget --user=root --password=root http://10.1.1.114:680/temp_trans/pro_env/$src +#mkdir -p $dest && tar -zxf $src -C $dest +#rm -f $src + +###ENV +echo "set /etc/profile JAVA_ENV" +cat >>/etc/profile<