mirror of
https://github.com/maxkratz/dockerfiles.git
synced 2024-09-08 00:03:50 +00:00
fixups
Signed-off-by: Jess Frazelle <jess@oxide.computer>
This commit is contained in:
parent
dc804860d8
commit
bc9fa38214
3 changed files with 3 additions and 26 deletions
|
@ -32,7 +32,7 @@ build_and_push(){
|
|||
done
|
||||
|
||||
# also push the tag latest for "stable" (chrome), "tools" (wireguard) or "3.5" tags for zookeeper
|
||||
if [[ "$suite" == "stable" ]] || [[ "$suite" == "3.5" ]] || [[ "$suite" == "tools" ]]; then
|
||||
if [[ "$suite" == "stable" ]] || [[ "$suite" == "3.6" ]] || [[ "$suite" == "tools" ]]; then
|
||||
docker tag "${REPO_URL}/${base}:${suite}" "${REPO_URL}/${base}:latest"
|
||||
docker push --disable-content-trust=false "${REPO_URL}/${base}:latest"
|
||||
fi
|
||||
|
|
|
@ -46,7 +46,7 @@ get_latest() {
|
|||
elif [[ "$dir" == "Tautulli" ]]; then
|
||||
dir="plexpy"
|
||||
elif [[ "$dir" == "zookeeper" ]]; then
|
||||
dir="zookeeper/3.5"
|
||||
dir="zookeeper/3.6"
|
||||
elif [[ "$dir" == "oauth2_proxy" ]]; then
|
||||
dir="oauth2-proxy"
|
||||
fi
|
||||
|
@ -92,7 +92,7 @@ get_latest_unifi() {
|
|||
|
||||
compare() {
|
||||
local name="$1" dir="$2" tag="$3" current="$4" releases="$5"
|
||||
ignore_dirs=( "mc" "zookeeper/3.5" )
|
||||
ignore_dirs=( "mc" )
|
||||
|
||||
if [[ "$tag" =~ $current ]] || [[ "$name" =~ $current ]] || [[ "$current" =~ $tag ]] || [[ "$current" == "master" ]]; then
|
||||
echo -e "\\e[36m${dir}:\\e[39m current ${current} | ${tag} | ${name}"
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
FROM openjdk:8-alpine
|
||||
|
||||
ENV ZOOKEEPER_VERSION 3.5.5
|
||||
ENV PATH $PATH:/opt/zookeeper/bin/
|
||||
|
||||
# the start files for zookeeper use bash
|
||||
RUN apk --no-cache add \
|
||||
bash
|
||||
|
||||
RUN buildDeps=' \
|
||||
curl \
|
||||
tar \
|
||||
' \
|
||||
&& echo "==> Installing dependencies..." \
|
||||
&& apk --no-cache add --virtual build-deps $buildDeps \
|
||||
&& echo "==> Downloading Zookeeper..." \
|
||||
&& mkdir -p /opt \
|
||||
&& curl -sSL "http://apache.osuosl.org/zookeeper/zookeeper-${ZOOKEEPER_VERSION}/apache-zookeeper-${ZOOKEEPER_VERSION}.tar.gz" | tar -xzf - -C /opt \
|
||||
&& mv /opt/apache-zookeeper-${ZOOKEEPER_VERSION} /opt/zookeeper \
|
||||
&& cp /opt/zookeeper/conf/zoo_sample.cfg /opt/zookeeper/conf/zoo.cfg \
|
||||
&& apk del build-deps
|
||||
|
||||
ENTRYPOINT ["zkServer.sh", "start-foreground"]
|
Loading…
Reference in a new issue