From 1e1b313abf1d7d3d3548714d0ce9423796048211 Mon Sep 17 00:00:00 2001 From: Shubham Bhattar Date: Sun, 14 Oct 2018 18:00:06 +0530 Subject: [PATCH] MAINTAINER is deprecated in Dockerfile. COPY is preferred over ADD in Dockerfile if additional functonality of ADD is not being used. Improved Shebang lines in many files. --- chainquery/Dockerfile | 8 ++++---- chainquery/debugpaste-it.sh | 2 +- chainquery/docker-entrypoint.sh | 2 +- chainquery/start.sh | 2 +- lbrycrd/Dockerfile | 8 ++++---- lbrycrd/debugpaste-it.sh | 2 +- lbrycrd/docker-entrypoint.sh | 2 +- lbrycrd/start.sh | 2 +- lbrynet-daemon/Dockerfile | 4 ++-- lbrynet-daemon/debugpaste-it.sh | 2 +- reflector.go/Dockerfile | 6 +++--- reflector.go/compile/Dockerfile | 6 +++--- reflector.go/compile/start.sh | 2 +- traefik/debugpaste-it.sh | 2 +- traefik/network-up.sh | 2 +- www.spee.ch/Dockerfile | 8 ++++---- www.spee.ch/debugpaste-it.sh | 2 +- www.spee.ch/docker-entrypoint.sh | 2 +- 18 files changed, 32 insertions(+), 32 deletions(-) diff --git a/chainquery/Dockerfile b/chainquery/Dockerfile index 932dd44..9301f54 100644 --- a/chainquery/Dockerfile +++ b/chainquery/Dockerfile @@ -1,10 +1,10 @@ ## This base image is for running latest chainquery FROM ubuntu:18.04 -MAINTAINER chamunks [at] gmail [dot] com +LABEL MAINTAINER="chamunks [at] gmail [dot] com" -ADD chainqueryconfig.toml /data/chainqueryconfig.toml -ADD start.sh /usr/local/bin/start -ADD docker-entrypoint.sh /usr/local/bin/docker-entrypoint +COPY chainqueryconfig.toml /data/chainqueryconfig.toml +COPY start.sh /usr/local/bin/start +COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint RUN adduser chainquery --gecos GECOS --shell /bin/bash --disabled-password --home /data/ && \ apt-get update && \ diff --git a/chainquery/debugpaste-it.sh b/chainquery/debugpaste-it.sh index a9bf588..f1f641a 100755 --- a/chainquery/debugpaste-it.sh +++ b/chainquery/debugpaste-it.sh @@ -1 +1 @@ -#!/bin/bash +#!/usr/bin/env bash diff --git a/chainquery/docker-entrypoint.sh b/chainquery/docker-entrypoint.sh index 97933bf..77e798a 100755 --- a/chainquery/docker-entrypoint.sh +++ b/chainquery/docker-entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # default to run whatever the user wanted like "/bin/bash" ## If user runs no need to run any more of the entrypoint script. diff --git a/chainquery/start.sh b/chainquery/start.sh index 5bad500..acd303f 100755 --- a/chainquery/start.sh +++ b/chainquery/start.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ## For now keeping this simple. Potentially eventually add all command args as envvars for the Dockerfile or use safe way to add args via docker-compose.yml chainquery serve diff --git a/lbrycrd/Dockerfile b/lbrycrd/Dockerfile index 0d8fb18..a8f0b6c 100644 --- a/lbrycrd/Dockerfile +++ b/lbrycrd/Dockerfile @@ -1,7 +1,7 @@ ## This base image is for running latest lbrycrdd # For some reason I may switch this image over to Alpine when I can RCA why it won't start. FROM ubuntu:18.04 -MAINTAINER chamunks [at] gmail [dot] com +LABEL MAINTAINER="chamunks [at] gmail [dot] com" RUN adduser lbrycrdd --gecos GECOS --shell /bin/bash --disabled-password --home /data/ && \ apt-get update && \ @@ -20,9 +20,9 @@ RUN wget -O /usr/bin/lbrycrd-linux.zip https://github.com/lbryio/lbrycrd/release rm lbrycrd-linux.zip && \ chmod +x lbrycrdd lbrycrd-cli lbrycrd-tx -ADD debugpaste-it.sh /usr/local/bin/debugpaste-it -ADD start.sh /usr/local/bin/start -ADD docker-entrypoint.sh /usr/local/bin/docker-entrypoint +COPY debugpaste-it.sh /usr/local/bin/debugpaste-it +COPY start.sh /usr/local/bin/start +COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint USER lbrycrdd diff --git a/lbrycrd/debugpaste-it.sh b/lbrycrd/debugpaste-it.sh index 32612ec..7cdd39f 100755 --- a/lbrycrd/debugpaste-it.sh +++ b/lbrycrd/debugpaste-it.sh @@ -1,3 +1,3 @@ -#!/bin/bash +#!/usr/bin/env bash echo "placeholder for now, come back soon for more debugging magic" diff --git a/lbrycrd/docker-entrypoint.sh b/lbrycrd/docker-entrypoint.sh index 97933bf..77e798a 100755 --- a/lbrycrd/docker-entrypoint.sh +++ b/lbrycrd/docker-entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # default to run whatever the user wanted like "/bin/bash" ## If user runs no need to run any more of the entrypoint script. diff --git a/lbrycrd/start.sh b/lbrycrd/start.sh index c411f27..842a092 100755 --- a/lbrycrd/start.sh +++ b/lbrycrd/start.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # ## ToDo: # ## Get a test case to see if this is the first run or a repeat run diff --git a/lbrynet-daemon/Dockerfile b/lbrynet-daemon/Dockerfile index 1a285cc..021bf6b 100644 --- a/lbrynet-daemon/Dockerfile +++ b/lbrynet-daemon/Dockerfile @@ -1,6 +1,6 @@ ## This base image is for running the latest lbrynet-daemon release. FROM ubuntu:18.04 -MAINTAINER chamunks [at] gmail [dot] com +LABEL MAINTAINER="chamunks [at] gmail [dot] com" RUN apt-get update && apt-get -y install unzip # RUN mkdir -pv /data && chown 1000:1000 /data @@ -18,7 +18,7 @@ RUN wget -quiet -O /usr/bin/debugpaste https://github.com/nixc-us/debugpaste-it/ ## Install into PATH RUN mv /data/lbrynet-* /bin/ -ADD debugpaste-it.sh /usr/local/bin/debugpaste-it +COPY debugpaste-it.sh /usr/local/bin/debugpaste-it ## Daemon port [Intended for internal use] EXPOSE 4444 diff --git a/lbrynet-daemon/debugpaste-it.sh b/lbrynet-daemon/debugpaste-it.sh index f003d2d..54d00fb 100755 --- a/lbrynet-daemon/debugpaste-it.sh +++ b/lbrynet-daemon/debugpaste-it.sh @@ -1,2 +1,2 @@ -#!/bin/bash +#!/usr/bin/env bash echo "For now we're going to go with a tune in next time for a debugpaste." diff --git a/reflector.go/Dockerfile b/reflector.go/Dockerfile index 977507b..cfe154f 100644 --- a/reflector.go/Dockerfile +++ b/reflector.go/Dockerfile @@ -1,9 +1,9 @@ ## base image for github.com/lbryio/reflector.go release binaries FROM ubuntu:18:04 -MAINTAINER chamunks [at] gmail [dot] com +LABEL MAINTAINER="chamunks [at] gmail [dot] com" -ADD start.sh /usr/local/bin/start -ADD docker-entrypoint.sh /usr/local/bin/docker-entrypoint +COPY start.sh /usr/local/bin/start +COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint RUN adduser reflector --gecos GECOS --shell /bin/bash --disabled-password --home /data/ && \ apt-get update && \ diff --git a/reflector.go/compile/Dockerfile b/reflector.go/compile/Dockerfile index 2c1de9c..52bbc37 100644 --- a/reflector.go/compile/Dockerfile +++ b/reflector.go/compile/Dockerfile @@ -1,9 +1,9 @@ ## base image for github.com/lbryio/reflector.go release binaries FROM golang:1.11.1 -MAINTAINER chamunks [at] gmail [dot] com +LABEL MAINTAINER="chamunks [at] gmail [dot] com" -ADD start.sh /usr/local/bin/start -ADD docker-entrypoint.sh /usr/local/bin/docker-entrypoint +COPY start.sh /usr/local/bin/start +COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint RUN adduser reflector --gecos GECOS --shell /bin/bash --disabled-password --home /data/ diff --git a/reflector.go/compile/start.sh b/reflector.go/compile/start.sh index 2d0749e..9955357 100755 --- a/reflector.go/compile/start.sh +++ b/reflector.go/compile/start.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ## Launch service will tell prism-bin what mode to run in. LAUNCHMODE="${MODE:-$1}" diff --git a/traefik/debugpaste-it.sh b/traefik/debugpaste-it.sh index 95ef3e0..2d469c6 100755 --- a/traefik/debugpaste-it.sh +++ b/traefik/debugpaste-it.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash echo "=========================================================================" echo "=========================================================================" echo "lbry-docker: does not maintain or support custom configuration of traefik" diff --git a/traefik/network-up.sh b/traefik/network-up.sh index 3f36d16..c57ad5e 100644 --- a/traefik/network-up.sh +++ b/traefik/network-up.sh @@ -1,2 +1,2 @@ -#!/bin/bash +#!/usr/bin/env bash docker network create -d bridge --subnet=10.5.1.0/16 lbrynet diff --git a/www.spee.ch/Dockerfile b/www.spee.ch/Dockerfile index fc8297c..6986e2a 100644 --- a/www.spee.ch/Dockerfile +++ b/www.spee.ch/Dockerfile @@ -3,7 +3,7 @@ ## https://hub.docker.com/_/node/ # 8.11.2-alpine, 8.11-alpine, 8-alpine, carbon-alpine (8/alpine/Dockerfile) FROM node:8-alpine -MAINTAINER chamunks [at] gmail [dot] com +LABEL MAINTAINER="chamunks [at] gmail [dot] com" ## Install base packages and clone repo to src directory. RUN apk update && apk --no-cache add git curl wget python build-base bash && \ @@ -20,9 +20,9 @@ RUN wget -quiet -O /usr/bin/debugpaste https://github.com/nixc-us/debugpaste-it/ ## Install container support files RUN curl -s https://raw.githubusercontent.com/chamunks/docker-support/master/install | /bin/sh -ADD docker-entrypoint.sh /usr/local/bin/docker-entrypoint -ADD healthcheck.sh /usr/local/bin/healthcheck -ADD debugpaste-it.sh /usr/local/bin/debugpaste-it +COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint +COPY healthcheck.sh /usr/local/bin/healthcheck +COPY debugpaste-it.sh /usr/local/bin/debugpaste-it HEALTHCHECK CMD healthcheck diff --git a/www.spee.ch/debugpaste-it.sh b/www.spee.ch/debugpaste-it.sh index f003d2d..54d00fb 100755 --- a/www.spee.ch/debugpaste-it.sh +++ b/www.spee.ch/debugpaste-it.sh @@ -1,2 +1,2 @@ -#!/bin/bash +#!/usr/bin/env bash echo "For now we're going to go with a tune in next time for a debugpaste." diff --git a/www.spee.ch/docker-entrypoint.sh b/www.spee.ch/docker-entrypoint.sh index 0e4075a..b1e5fad 100755 --- a/www.spee.ch/docker-entrypoint.sh +++ b/www.spee.ch/docker-entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eo pipefail ## Add -x to set if you want really explicit feedback. ## -u breaks unbound variables