Skip to content

Commit

Permalink
Update fc32
Browse files Browse the repository at this point in the history
  • Loading branch information
@startxfr
startxfr committed May 18, 2021
1 parent 31d80e8 commit c817b35
Show file tree
Hide file tree
Showing 41 changed files with 404 additions and 217 deletions.
23 changes: 13 additions & 10 deletions GitlabRunner/ansible/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ LABEL name="$SX_ID" \
fr.startx.component="$SX_ID:$SX_VERSION"

USER root

COPY sx /tmp/
RUN dnf install -yq --nogpgcheck yum-utils dnf-plugin-system-upgrade && \
dnf upgrade -yq --nogpgcheck --refresh && \
dnf install -yq --nogpgcheck \
make \
python-pip \
ansible \
bubblewrap \
rsync \
curl \
npm nodejs \
openssh-clients \
sshpass && \
make \
python-pip \
ansible \
bubblewrap \
rsync \
curl \
npm nodejs \
openssh-clients \
sshpass && \
pip install openshift && \
dnf install -yq --nogpgcheck 'dnf-command(config-manager)' && \
dnf config-manager --enable --add-repo https://releases.ansible.com/ansible-runner/ansible-runner.el7.repo && \
Expand All @@ -42,6 +42,9 @@ RUN dnf install -yq --nogpgcheck yum-utils dnf-plugin-system-upgrade && \
npm install uuid && \
dnf remove -yq --skip-broken dnf-plugin-system-upgrade yum-utils yum && \
dnf clean all --enablerepo=\* && \
mv /tmp/bin/* /bin/ && \
mv /tmp/lib/* $SX_LIBDIR/ && \
rm -rf /tmp/bin /tmp/bin && \
cd /tmp && \
wget -q https://github.com/gohugoio/hugo/releases/download/v${SX_HUGO_RELEASE}/hugo_${SX_HUGO_RELEASE}_Linux-64bit.tar.gz && \
tar xzvf hugo_${SX_HUGO_RELEASE}_Linux-64bit.tar.gz && \
Expand Down
18 changes: 18 additions & 0 deletions GitlabRunner/ansible/sx/bin/sx-runner-ansible
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash
source $SX_LIBDIR/sx-runner-ansible

# Dispatch input arguments
case $1 in
assemble|build) genericBuild $@ ;;
post-build) genericPostBuild $@ ;;
pre-deploy) genericPreDeploy $@ ;;
post-deploy) genericPostDeploy $@ ;;
run|start) genericRun $@ ;;
isLive|health) genericIsLive $@ ;;
isReady) genericIsReady $@ ;;
info|--info) runnerAnsibleInformation $@ ;;
usage|help|--help) genericUsage $@ ;;
usageS2i) genericUsageS2I $@ ;;
version|--version) genericVersion $@ ;;
*) genericWelcome $@ ;;
esac
8 changes: 8 additions & 0 deletions GitlabRunner/ansible/sx/lib/sx-runner-ansible
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
source $SX_LIBDIR/sx

# Display ansible information
function runnerAnsibleInformation {
genericAllInformation $1
echoVerbose $1 "runner make : " `make --version | head -n 1`
}
20 changes: 12 additions & 8 deletions GitlabRunner/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,22 @@ LABEL name="$SX_ID" \
fr.startx.component="$SX_ID:$SX_VERSION"

USER root
RUN dnf install -yq yum-utils dnf-plugin-system-upgrade && \
dnf upgrade -yq --refresh && \
COPY sx /tmp/
RUN dnf install -yq --nogpgcheck yum-utils dnf-plugin-system-upgrade && \
dnf upgrade -yq --nogpgcheck --refresh && \
dnf install -yq --nogpgcheck \
make \
bubblewrap \
rsync \
openssh-clients \
sshpass && \
make \
bubblewrap \
rsync \
openssh-clients \
sshpass && \
package-cleanup --problems && \
package-cleanup --orphans && \
dnf remove -yq --skip-broken dnf-plugin-system-upgrade yum-utils yum && \
dnf clean all --enablerepo=\*
dnf clean all --enablerepo=\* && \
mv /tmp/bin/* /bin/ && \
mv /tmp/lib/* $SX_LIBDIR/ && \
rm -rf /tmp/bin /tmp/bin

USER 1001

Expand Down
19 changes: 19 additions & 0 deletions GitlabRunner/apache/sx/bin/sx-runner-apache
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash
source $SX_LIBDIR/sx-runner-apache

check_apache_environment
# Dispatch input arguments
case $1 in
assemble|build) apacheBuild $@ ;;
post-build) apachePostBuild $@ ;;
pre-deploy) apachePreDeploy $@ ;;
post-deploy) apachePostDeploy $@ ;;
run|start) apacheRun $@ ;;
isLive|health) apacheIsLive $@ ;;
isReady) apacheIsReady $@ ;;
info|--info) runnerApacheInformation $@ ;;
usage|help|--help) genericUsage $@ ;;
usageS2i) genericUsageS2I $@ ;;
version|--version) genericVersion $@ ;;
*) genericWelcome $@ ;;
esac
8 changes: 8 additions & 0 deletions GitlabRunner/apache/sx/lib/sx-runner-apache
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
source $SX_LIBDIR/sx-apache

# Display apache information
function runnerApacheInformation {
apacheInformation $1
echoVerbose $1 "runner make : " `make --version | head -n 1`
}
20 changes: 12 additions & 8 deletions GitlabRunner/bash/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,22 @@ LABEL name="$SX_ID" \
fr.startx.component="$SX_ID:$SX_VERSION"

USER root
RUN dnf install -yq yum-utils dnf-plugin-system-upgrade && \
dnf upgrade -yq --refresh && \
COPY sx /tmp/
RUN dnf install -yq --nogpgcheck yum-utils dnf-plugin-system-upgrade && \
dnf upgrade -yq --nogpgcheck --refresh && \
dnf install -yq --nogpgcheck \
make \
bubblewrap \
rsync \
openssh-clients \
sshpass && \
make \
bubblewrap \
rsync \
openssh-clients \
sshpass && \
package-cleanup --problems && \
package-cleanup --orphans && \
dnf remove -yq --skip-broken dnf-plugin-system-upgrade yum-utils yum && \
dnf clean all --enablerepo=\*
dnf clean all --enablerepo=\* && \
mv /tmp/bin/* /bin/ && \
mv /tmp/lib/* $SX_LIBDIR/ && \
rm -rf /tmp/bin /tmp/bin

USER 1001

Expand Down
18 changes: 18 additions & 0 deletions GitlabRunner/bash/sx/bin/sx-runner-bash
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash
source $SX_LIBDIR/sx-runner-bash

# Dispatch input arguments
case $1 in
assemble|build) genericBuild $@ ;;
post-build) genericPostBuild $@ ;;
pre-deploy) genericPreDeploy $@ ;;
post-deploy) genericPostDeploy $@ ;;
run|start) genericRun $@ ;;
isLive|health) genericIsLive $@ ;;
isReady) genericIsReady $@ ;;
info|--info) runnerBashInformation $@ ;;
usage|help|--help) genericUsage $@ ;;
usageS2i) genericUsageS2I $@ ;;
version|--version) genericVersion $@ ;;
*) genericWelcome $@ ;;
esac
8 changes: 8 additions & 0 deletions GitlabRunner/bash/sx/lib/sx-runner-bash
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
source $SX_LIBDIR/sx

# Display generic information
function runnerBashInformation {
genericAllInformation $1
echoVerbose $1 "runner make : " `make --version | head -n 1`
}
20 changes: 12 additions & 8 deletions GitlabRunner/nodejs/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,22 @@ LABEL name="$SX_ID" \
fr.startx.component="$SX_ID:$SX_VERSION"

USER root
RUN dnf install -yq yum-utils dnf-plugin-system-upgrade && \
dnf upgrade -yq --refresh && \
COPY sx /tmp/
RUN dnf install -yq --nogpgcheck yum-utils dnf-plugin-system-upgrade && \
dnf upgrade -yq --nogpgcheck --refresh && \
dnf install -yq --nogpgcheck \
make \
bubblewrap \
rsync \
openssh-clients \
sshpass && \
make \
bubblewrap \
rsync \
openssh-clients \
sshpass && \
package-cleanup --problems && \
package-cleanup --orphans && \
dnf remove -yq --skip-broken dnf-plugin-system-upgrade yum-utils yum && \
dnf clean all --enablerepo=\*
dnf clean all --enablerepo=\* && \
mv /tmp/bin/* /bin/ && \
mv /tmp/lib/* $SX_LIBDIR/ && \
rm -rf /tmp/bin /tmp/bin

USER 1001

Expand Down
19 changes: 19 additions & 0 deletions GitlabRunner/nodejs/sx/bin/sx-runner-nodejs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash
source $SX_LIBDIR/sx-runner-nodejs

check_nodejs_environment
# Dispatch input arguments
case $1 in
assemble|build) nodejsBuild $@ ;;
post-build) nodejsPostBuild $@ ;;
pre-deploy) nodejsPreDeploy $@ ;;
post-deploy) nodejsPostDeploy $@ ;;
run|start) nodejsRun $@ ;;
isLive|health) nodejsIsLive $@ ;;
isReady) nodejsIsReady $@ ;;
info|--info) runnerNodejsInformation $@ ;;
usage|help|--help) genericUsage $@ ;;
usageS2i) genericUsageS2I $@ ;;
version|--version) genericVersion $@ ;;
*) genericWelcome $@ ;;
esac
8 changes: 8 additions & 0 deletions GitlabRunner/nodejs/sx/lib/sx-runner-nodejs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
source $SX_LIBDIR/sx-nodejs

# Display nodejs information
function runnerNodejsInformation {
nodejsInformation $1
echoVerbose $1 "runner make : " `make --version | head -n 1`
}
12 changes: 9 additions & 3 deletions GitlabRunner/oc/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@ LABEL name="$SX_ID" \
fr.startx.component="$SX_ID:$SX_VERSION"

USER root
RUN dnf install -yq python3-pip jq && \
pip3 install yq && \
COPY sx /tmp/
RUN dnf install -yq --nogpgcheck \
jq \
python3-pip && \
pip install yq && \
cd /tmp && \
wget -q https://mirror.openshift.com/pub/openshift-v4/clients/ocp/$SX_OC_VERSION/openshift-client-linux-$SX_OC_VERSION.tar.gz && \
tar xzvf openshift-client-linux-$SX_OC_VERSION.tar.gz && \
Expand All @@ -31,7 +34,10 @@ RUN dnf install -yq python3-pip jq && \
tar xzvf openshift-install-linux-$SX_OC_VERSION.tar.gz && \
mv openshift-install /usr/bin/ && \
rm -f openshift-install-linux-$SX_OC_VERSION.tar.gz && \
cd -
cd - && \
mv /tmp/bin/* /bin/ && \
mv /tmp/lib/* $SX_LIBDIR/ && \
rm -rf /tmp/bin /tmp/bin

USER 1001

Expand Down
18 changes: 18 additions & 0 deletions GitlabRunner/oc/sx/bin/sx-runner-oc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash
source $SX_LIBDIR/sx-runner-oc

# Dispatch input arguments
case $1 in
assemble|build) genericBuild $@ ;;
post-build) genericPostBuild $@ ;;
pre-deploy) genericPreDeploy $@ ;;
post-deploy) genericPostDeploy $@ ;;
run|start) genericRun $@ ;;
isLive|health) genericIsLive $@ ;;
isReady) genericIsReady $@ ;;
info|--info) runnerOcInformation $@ ;;
usage|help|--help) genericUsage $@ ;;
usageS2i) genericUsageS2I $@ ;;
version|--version) genericVersion $@ ;;
*) genericWelcome $@ ;;
esac
9 changes: 9 additions & 0 deletions GitlabRunner/oc/sx/lib/sx-runner-apache
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash
source $SX_LIBDIR/sx

# Display apache information
function runnerOcInformation {
genericAllInformation $1
echoVerbose $1 "runner oc : " `oc --version`
echoVerbose $1 "runner make : " `make --version | head -n 1`
}
20 changes: 12 additions & 8 deletions GitlabRunner/php/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,22 @@ LABEL name="$SX_ID" \
fr.startx.component="$SX_ID:$SX_VERSION"

USER root
RUN dnf install -yq yum-utils dnf-plugin-system-upgrade && \
dnf upgrade -yq --refresh && \
COPY sx /tmp/
RUN dnf install -yq --nogpgcheck yum-utils dnf-plugin-system-upgrade && \
dnf upgrade -yq --nogpgcheck --refresh && \
dnf install -yq --nogpgcheck \
make \
bubblewrap \
rsync \
openssh-clients \
sshpass && \
make \
bubblewrap \
rsync \
openssh-clients \
sshpass && \
package-cleanup --problems && \
package-cleanup --orphans && \
dnf remove -yq --skip-broken dnf-plugin-system-upgrade yum-utils yum && \
dnf clean all --enablerepo=\*
dnf clean all --enablerepo=\* && \
mv /tmp/bin/* /bin/ && \
mv /tmp/lib/* $SX_LIBDIR/ && \
rm -rf /tmp/bin /tmp/bin

USER 1001

Expand Down
19 changes: 19 additions & 0 deletions GitlabRunner/php/sx/bin/sx-runner-php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash
source $SX_LIBDIR/sx-runner-php

check_php_environment
# Dispatch input arguments
case $1 in
assemble|build) phpBuild $@ ;;
post-build) phpPostBuild $@ ;;
pre-deploy) phpPreDeploy $@ ;;
post-deploy) phpPostDeploy $@ ;;
run|start) phpRun $@ ;;
isLive|health) phpIsLive $@ ;;
isReady) phpIsReady $@ ;;
info|--info) runnerPhpInformation $@ ;;
usage|help|--help) genericUsage $@ ;;
usageS2i) genericUsageS2I $@ ;;
version|--version) genericVersion $@ ;;
*) genericWelcome $@ ;;
esac
8 changes: 8 additions & 0 deletions GitlabRunner/php/sx/lib/sx-runner-php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
source $SX_LIBDIR/sx-php

# Display php information
function runnerPhpInformation {
phpInformation $1
echoVerbose $1 "runner make : " `make --version | head -n 1`
}

0 comments on commit c817b35

Please sign in to comment.