Skip to content
Snippets Groups Projects
Commit 49149e5d authored by Raul Barreras's avatar Raul Barreras
Browse files

Merge branch 'alpine-ssh-client' into 'develop'

Alpine ssh client

See merge request !36
parents ae707aea 20ab34a6
No related branches found
No related tags found
3 merge requests!45Develop,!37Sync Master with Develop,!36Alpine ssh client
...@@ -18,9 +18,9 @@ GIT_COMMIT = $(strip $(shell git rev-parse --short HEAD)) ...@@ -18,9 +18,9 @@ GIT_COMMIT = $(strip $(shell git rev-parse --short HEAD))
#################### ####################
BUILD_ARGS := --build-arg VCS_REF=$(GIT_COMMIT) BUILD_ARGS := --build-arg VCS_REF=$(GIT_COMMIT)
.PHONY: all clean test $(DOCKERFILES) static-code-analysis mobile delete_dangling_images security publish .PHONY: all clean test $(DOCKERFILES) static-code-analysis mobile delete_dangling_images security publish utility
all: php-lint php-unit-test magento2 mobile static-code-analysis detect-secrets dependency-check all: php-lint php-unit-test magento2 mobile static-code-analysis utility detect-secrets dependency-check
# Image Groups # Image Groups
#################### ####################
...@@ -29,6 +29,7 @@ php-unit-test: php-unit-test_5.6 php-unit-test_7.0 php-unit-test_7.1 php-unit-te ...@@ -29,6 +29,7 @@ php-unit-test: php-unit-test_5.6 php-unit-test_7.0 php-unit-test_7.1 php-unit-te
magento2: magento2-unit-test magento2-xml-lint magento2: magento2-unit-test magento2-xml-lint
mobile: android-build-server mobile: android-build-server
static-code-analysis: static-code-analysis_latest static-code-analysys_php static-code-analysys_python static-code-analysys_android static-code-analysis: static-code-analysis_latest static-code-analysys_php static-code-analysys_python static-code-analysys_android
utility: alpine-ssh-client
# PHP Lint Images # PHP Lint Images
#################### ####################
...@@ -91,6 +92,11 @@ static-code-analysys_python: static-code-analysis/Dockerfile ...@@ -91,6 +92,11 @@ static-code-analysys_python: static-code-analysis/Dockerfile
static-code-analysys_android: android-build-server static-code-analysis/android/Dockerfile static-code-analysys_android: android-build-server static-code-analysis/android/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/static-code-analysis:android static-code-analysis/android/ docker build $(BUILD_ARGS) -t ${REPO_ORG}/static-code-analysis:android static-code-analysis/android/
# Utility Images
####################
alpine-ssh-client: alpine-ssh-client/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/alpine-ssh-client:latest alpine-ssh-client/
test: $(DOCKERFILES) test: $(DOCKERFILES)
$(DOCKERFILES): $(DOCKERFILES):
@echo "Linting and validating $(@D)..." @echo "Linting and validating $(@D)..."
......
...@@ -2,14 +2,15 @@ ...@@ -2,14 +2,15 @@
# Docker-ci # Docker-ci
## Containers usefull in CI process ## Containers useful in CI process
### Building Images ### Building Images
To build these images, clone this repository onto a machine with docker and make installed. Run `make` and all of the images will be built and installed as local docker images. To build these images, clone this repository onto a machine with docker and make installed. Run `make` and all of the images will be built and installed as local docker images.
This file is automatically updated after execute `git commit` based on the content of file `_README.md` To enable this feature, execute `.dev/bootstrap.sh` after cloning the repo. This file is automatically updated after execute `git commit` based on the content of file `_README.md` To enable this feature, execute `.dev/bootstrap.sh` after cloning the repo.
### Available tools \n\n- its-registry.unl.edu/unl-its/docker-ci/android-build-server:latest ### Available tools \n\n- its-registry.unl.edu/unl-its/docker-ci/alpine-ssh-client:latest
- its-registry.unl.edu/unl-its/docker-ci/android-build-server:latest
- its-registry.unl.edu/unl-its/docker-ci/dependency-check - its-registry.unl.edu/unl-its/docker-ci/dependency-check
- its-registry.unl.edu/unl-its/docker-ci/detect-secrets - its-registry.unl.edu/unl-its/docker-ci/detect-secrets
- its-registry.unl.edu/unl-its/docker-ci/magento2-unit-test:latest - its-registry.unl.edu/unl-its/docker-ci/magento2-unit-test:latest
...@@ -25,4 +26,4 @@ This file is automatically updated after execute `git commit` based on the conte ...@@ -25,4 +26,4 @@ This file is automatically updated after execute `git commit` based on the conte
- its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:android - its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:android
- its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:latest - its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:latest
- its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:php - its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:php
- its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:python \n \n\n\r_Last update: Fri Sep 20 09:15:46 CDT 2019_\n - its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:python \n \n\n\r_Last update: Mon Sep 23 13:08:00 CDT 2019_\n
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Docker-ci # Docker-ci
## Containers usefull in CI process ## Containers useful in CI process
### Building Images ### Building Images
......
FROM alpine:latest
ARG BUILD_DATE
ARG VCS_REF
ARG VERSION
LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name="Alpine OpenSSH Client" \
org.label-schema.description="Alpine image with OpenSSH client" \
org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vendor="University of Nebraska - Lincoln" \
org.label-schema.version="0.1.0" \
org.label-schema.schema-version="1.0" \
maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
RUN apk add --no-cache openssh-client ca-certificates
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment