xZero707/dockerfiles
1
0
Fork 0
mirror of https://github.com/jessfraz/dockerfiles.git synced 2025-02-17 09:37:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

small fixes

Browse Source 
Signed-off-by: Jess Frazelle <me@jessfraz.com>
This commit is contained in:
Jess Frazelle 2016-08-11 15:43:41 -07:00
parent b8389ebdd5
commit 7be073bc3f
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
4 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
build-all.sh
View File

@ -6,11 +6,9 @@ build_and_push(){
suite=$2 suite=$2
build_dir=$3 build_dir=$3
( docker build --rm --force-rm -t r.j3ss.co/${base}:${suite} ${build_dir} || return 1
set -x
docker build --rm --force-rm -t r.j3ss.co/${base}:${suite} ${build_dir} || exit 1
)
# on successful build, push the image
echo " --- " echo " --- "
echo "Successfully built ${base}:${suite} with context ${build_dir}" echo "Successfully built ${base}:${suite} with context ${build_dir}"
echo " --- " echo " --- "
@ -30,7 +28,6 @@ build_and_push(){
docker tag r.j3ss.co/${base}:${suite} r.j3ss.co/${base}:latest docker tag r.j3ss.co/${base}:${suite} r.j3ss.co/${base}:latest
docker push --disable-content-trust=false r.j3ss.co/${base}:latest docker push --disable-content-trust=false r.j3ss.co/${base}:latest
fi fi
} }
main(){ main(){
@ -58,19 +55,20 @@ main(){
{ {
build_and_push "${base}" "${suite}" "${build_dir}" build_and_push "${base}" "${suite}" "${build_dir}"
} || { } || {
# add to errors # add to errors
ERRORS+=("${base}:${suite}") ERRORS+=("${base}:${suite}")
} }
echo echo
echo echo
done done
if [ ${#ERRORS[@]} -eq 0 ]; then if [ ${#ERRORS[@]} -eq 0 ]; then
echo "No errors, hooray" echo "No errors, hooray!"
else else
echo "These images failed: ${ERRORS[@]}" echo "[ERROR] Some images did not build correctly, see below." >&2
exit 1 echo "These images failed: ${ERRORS[@]}" >&2
fi exit 1
fi
} }
main $@ main $@

2
chrome/beta/Dockerfile
View File

@ -28,7 +28,7 @@ RUN echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sourc
hicolor-icon-theme \ hicolor-icon-theme \
libgl1-mesa-dri \ libgl1-mesa-dri \
libgl1-mesa-glx \ libgl1-mesa-glx \
libpulse0 \ libpulse0 \
libv4l-0 \ libv4l-0 \
-t testing \ -t testing \
fonts-symbola \ fonts-symbola \

2
chrome/stable/Dockerfile
View File

@ -28,7 +28,7 @@ RUN echo 'deb http://httpredir.debian.org/debian testing main' >> /etc/apt/sourc
hicolor-icon-theme \ hicolor-icon-theme \
libgl1-mesa-dri \ libgl1-mesa-dri \
libgl1-mesa-glx \ libgl1-mesa-glx \
libpulse0 \ libpulse0 \
libv4l-0 \ libv4l-0 \
-t testing \ -t testing \
fonts-symbola \ fonts-symbola \

19
t/Dockerfile
View File

@ -1,11 +1,16 @@
FROM alpine:latest FROM ruby:2-alpine
MAINTAINER Jessica Frazelle <jess@docker.com> MAINTAINER Jessica Frazelle <jess@docker.com>
RUN apk --no-cache add \ RUN apk add --no-cache \
build-base \ ca-certificates
ca-certificates \
ruby \ RUN set -x \
ruby-dev \ && apk add --no-cache --virtual .build-deps \
&& gem install --no-document io-console t build-base \
&& gem install \
io-console \
t \
--no-rdoc --no-ri \
&& apk del .build-deps
ENTRYPOINT [ "t" ] ENTRYPOINT [ "t" ]