mirror of https://github.com/kdabir/has.git
[WIP] change references (#46)
* change references * Fix containers (#47) * spelling * remove extra xz install * more references * more stable strategy for installing node, npm * more flexible version pinning for alpine * syntax Co-authored-by: Stephen Dolenc <sdolenc@users.noreply.github.com>
This commit is contained in:
parent
3dd103126e
commit
90d1817ab9
|
@ -22,7 +22,7 @@ jobs:
|
|||
- debian # uses debian:buster-20200327-slim which is debian 10.3
|
||||
- ubuntu16 # uses ubuntu:xenial-20200212 which is ubuntu 16.04
|
||||
|
||||
container: sdolenc/testing-has:${{ matrix.container }}
|
||||
container: kdabir/has-test-containers:${{ matrix.container }}
|
||||
|
||||
steps:
|
||||
- name: Clone Repo
|
||||
|
@ -41,7 +41,7 @@ jobs:
|
|||
- ubuntu # uses ubuntu:bionic-20200311 which is ubuntu 18.04
|
||||
- alpine # uses bash:5.0.16 which is alpine 3.11
|
||||
|
||||
container: sdolenc/testing-has:${{ matrix.container }}
|
||||
container: kdabir/has-test-containers:${{ matrix.container }}
|
||||
|
||||
steps:
|
||||
- name: Clone Repo
|
||||
|
|
|
@ -188,13 +188,13 @@ teardown() {
|
|||
[ ! "${lines[0]##*\ }" = "${lines[1]##*\ }" ]
|
||||
}
|
||||
|
||||
@test "quite mode" {
|
||||
@test "quiet mode" {
|
||||
run $has -q
|
||||
[ "$status" -eq 0 ]
|
||||
[ -z "${output}" ]
|
||||
}
|
||||
|
||||
@test "status code in quite mode still equal to number of failed commands" {
|
||||
@test "status code in quiet mode still equal to number of failed commands" {
|
||||
HAS_ALLOW_UNSAFE=y run $has -q foobar bc git barbaz
|
||||
|
||||
[ "$status" -eq 2 ]
|
||||
|
|
|
@ -4,7 +4,7 @@ Custom containers used for testing https://github.com/kdabir/has
|
|||
|
||||
| container image | status |
|
||||
|------------------------------|--------|
|
||||
| sdolenc/testing-has:alpine | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/sdolenc/testing-has/alpine) |
|
||||
| sdolenc/testing-has:ubuntu | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/sdolenc/testing-has/ubuntu) |
|
||||
| sdolenc/testing-has:debian | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/sdolenc/testing-has/debian) |
|
||||
| sdolenc/testing-has:ubuntu16 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/sdolenc/testing-has/ubuntu16) |
|
||||
| kdabir/has-test-containers:alpine | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/kdabir/has-test-containers/alpine) |
|
||||
| kdabir/has-test-containers:ubuntu | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/kdabir/has-test-containers/ubuntu) |
|
||||
| kdabir/has-test-containers:debian | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/kdabir/has-test-containers/debian) |
|
||||
| kdabir/has-test-containers:ubuntu16 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/kdabir/has-test-containers/ubuntu16) |
|
||||
|
|
|
@ -12,46 +12,46 @@ FROM bash:5.0.16
|
|||
# wget
|
||||
# xz
|
||||
RUN apk add --no-cache \
|
||||
ack=3.2.0-r0 \
|
||||
ack~=3.2.0 \
|
||||
apache2-utils~=2.4 `# ab=2.3` \
|
||||
apache-ant=1.10.7-r0 `# ant=1.10.7` \
|
||||
apache-ant~=1.10.8 `# ant=1.10.8` \
|
||||
build-base libffi-dev openssl-dev `# required for eb` \
|
||||
curl=7.67.0-r0 \
|
||||
bzr=2.7.0-r1 \
|
||||
docker=19.03.5-r0 \
|
||||
emacs=26.3-r2 \
|
||||
file=5.37-r1 \
|
||||
gcc=9.2.0-r4 \
|
||||
curl~=7.67.0 \
|
||||
bzr~=2.7.0 \
|
||||
docker~=19.03.5 \
|
||||
emacs~=26.3 \
|
||||
file~=5.37 \
|
||||
gcc~=9.2.0 \
|
||||
git~=2.24.3 \
|
||||
go=1.13.4-r1 \
|
||||
gradle=5.6.4-r0 \
|
||||
hugo=0.61.0-r0 \
|
||||
jq=1.6-r0 \
|
||||
make=4.2.1-r2 \
|
||||
maven=3.6.3-r0 `# mvn=3.6.3` \
|
||||
mercurial=5.3.2-r0 `# hg=5.3.2` \
|
||||
nano=4.6-r0 \
|
||||
ncurses=6.1_p20200118-r3 `#tput:todo` \
|
||||
npm=12.15.0-r1 `# npm=6.13.4 # node=12.15.0` \
|
||||
openjdk11=11.0.5_p10-r0 `# java=11.0.5` \
|
||||
perl=5.30.1-r0 ` # perl=30` \
|
||||
php7=7.3.17-r0 `# php=7.3.17 ` \
|
||||
postgresql=12.2-r0 `# psql=12.2` \
|
||||
pv=1.6.6-r1 \
|
||||
python=2.7.16-r3 \
|
||||
python3-dev=3.8.2-r0 `#python3=3.8.2` \
|
||||
R=3.6.2-r0 \
|
||||
ruby=2.6.6-r2 `# gem=3.0.3` \
|
||||
ruby-bundler=2.0.2-r1 `# bundle=2.0.2` \
|
||||
go~=1.13.10 \
|
||||
gradle~=5.6.4 \
|
||||
hugo~=0.61.0 \
|
||||
jq=~1.6 \
|
||||
make~=4.2.1 \
|
||||
maven~=3.6.3 `# mvn=3.6.3` \
|
||||
mercurial~=5.3.2 `# hg=5.3.2` \
|
||||
nano~=4.6 \
|
||||
ncurses~=6.1_p20200118 `#tput:todo` \
|
||||
npm~=12.15.0 `# npm=6.13.4 # node=12.15.0` \
|
||||
openjdk11~=11.0.5 `# java=11.0.5` \
|
||||
perl~=5.30 ` # perl=30` \
|
||||
php7~=7.3.18 `# php=7.3.18 ` \
|
||||
postgresql~=12.2 `# psql=12.2` \
|
||||
pv~=1.6.6 \
|
||||
python~=2.7.18 \
|
||||
python3-dev~=3.8.2 `#python3=3.8.2` \
|
||||
R~=3.6.2 \
|
||||
ruby~=2.6.6 `# gem=3.0.3` \
|
||||
ruby-bundler~=2.0.2 `# bundle=2.0.2` \
|
||||
ruby-bigdecimal ruby-json `# required for brew` \
|
||||
ruby-rake=2.6.6-r2 `# rake=12.3.3` \
|
||||
subversion=1.12.2-r1 `# svn=1.12.2` \
|
||||
sudo=1.8.31-r0 \
|
||||
tree=1.8.0-r0 \
|
||||
ruby-rake~=2.6.6 `# rake=12.3.3` \
|
||||
subversion~=1.12.2 `# svn=1.12.2` \
|
||||
sudo~=1.8.31 \
|
||||
tree~=1.8.0 \
|
||||
vim~=8.2 \
|
||||
yarn=1.19.2-r0 \
|
||||
zip=3.0-r7 \
|
||||
zsh=5.7.1-r0 && \
|
||||
yarn~=1.19.2 \
|
||||
zip~=3.0 \
|
||||
zsh~=5.7.1 && \
|
||||
\
|
||||
# required for brew and lein
|
||||
ln -s $(which bash) /bin/bash && \
|
||||
|
@ -136,6 +136,7 @@ RUN apk add --no-cache \
|
|||
ln -s "/scala-${scala}/bin/scala" /usr/local/bin/scala && \
|
||||
\
|
||||
echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
|
||||
echo "http://dl-cdn.alpinelinux.org/alpine/v3.12/community" >> /etc/apk/repositories `# podman requires crun` && \
|
||||
apk add --no-cache \
|
||||
leiningen=2.9.1-r0 `# lein=2.9.1` \
|
||||
podman=1.9.0-r0
|
||||
leiningen~=2.9.3 `# lein=2.9.3` \
|
||||
podman~=1.9.3
|
||||
|
|
|
@ -10,7 +10,6 @@ FROM debian:buster-20200327-slim
|
|||
RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install --no-install-recommends -y -qq \
|
||||
bc \
|
||||
pv \
|
||||
xz-utils \
|
||||
unar \
|
||||
make \
|
||||
curl \
|
||||
|
|
|
@ -119,19 +119,23 @@ RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install --no-inst
|
|||
sbt --version && sbt --version && \
|
||||
\
|
||||
add-apt-repository -y ppa:longsleep/golang-backports `#go` && \
|
||||
curl -sL https://deb.nodesource.com/setup_12.x | bash - `#node and npm` &&\
|
||||
add-apt-repository -y ppa:ondrej/php `#php5` && \
|
||||
add-apt-repository -y ppa:projectatomic/ppa `#podman` && \
|
||||
wget -qO - https://download.sublimetext.com/sublimehq-pub.gpg | sudo apt-key add - `#subl` && \
|
||||
add-apt-repository -y "deb https://download.sublimetext.com/ apt/stable/" `#subl` && \
|
||||
apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install --no-install-recommends -y -qq \
|
||||
golang-go=2:1.14* `# go=1.14.2` \
|
||||
nodejs=12.16.2* `# node=12.16.2 # npm=6.14.4` \
|
||||
php5.6=5.6.40* `# php5=5.6.40` \
|
||||
podman=1.6.2* \
|
||||
sublime-text=3211 `# subl=3211` && \
|
||||
ln -s /usr/bin/php5.6 /usr/bin/php5 && \
|
||||
\
|
||||
node=12.18.1 `# npm=6.14.5` && \
|
||||
curl -L "https://nodejs.org/dist/v${node}/node-v${node}-linux-x64.tar.gz" | tar xz && \
|
||||
ln -s "/node-v${node}-linux-x64/bin/node" /usr/local/bin/node && \
|
||||
ln -s "/node-v${node}-linux-x64/bin/npm" /usr/local/bin/npm && \
|
||||
ln -s "/node-v${node}-linux-x64/bin/npx" /usr/local/bin/npx `# todo` && \
|
||||
\
|
||||
npm install --global \
|
||||
brunch@"=3.0.0" \
|
||||
grunt-cli@"=1.3.2" \
|
||||
|
|
|
@ -10,7 +10,6 @@ FROM ubuntu:xenial-20200212
|
|||
RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install --no-install-recommends -y -qq \
|
||||
bc \
|
||||
pv \
|
||||
xz-utils \
|
||||
unar \
|
||||
make \
|
||||
curl \
|
||||
|
|
Loading…
Reference in New Issue