Skip to content

Commit 8713923

Browse files
zeroc0d3zeroc0d3
committed
Refactoring indentation with codeformatter & linter
1 parent eb2633d commit 8713923

39 files changed

Lines changed: 164 additions & 182 deletions

‎compose/app-compose-cicd-alpine.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3.7'
1+
version: "3.7"
22

33
#================================================================================================
44
# NETWORK SETUP
@@ -29,9 +29,9 @@ volumes:
2929
device: ${DATA_CICD_ALPINE:-/opt/data/docker/cicd-alpine}
3030

3131
services:
32-
#================================================================================================
33-
# PORTAINER
34-
#================================================================================================
32+
#================================================================================================
33+
# PORTAINER
34+
#================================================================================================
3535
portainer:
3636
image: dockerframework/portainer:${PORTAINER_VERSION:-2.9}
3737
container_name: ${CONTAINER_PORTAINER:-devopscorner_portainer}
@@ -49,9 +49,9 @@ services:
4949
devopscorner_net:
5050
ipv4_address: ${CONTAINER_IP_PORTAINER:-172.146.146.5}
5151

52-
#================================================================================================
53-
# CICD-ALPINE
54-
#================================================================================================
52+
#================================================================================================
53+
# CICD-ALPINE
54+
#================================================================================================
5555
cicd-alpine:
5656
build:
5757
context: ./docker/cicd-alpine
@@ -76,4 +76,4 @@ services:
7676
tty: true
7777
networks:
7878
devopscorner_net:
79-
ipv4_address: ${CONTAINER_IP_ALPINE:-172.146.146.213}
79+
ipv4_address: ${CONTAINER_IP_ALPINE:-172.146.146.213}

‎compose/app-compose-cicd-ubuntu.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3.7'
1+
version: "3.7"
22

33
#================================================================================================
44
# NETWORK SETUP
@@ -29,9 +29,9 @@ volumes:
2929
device: ${DATA_CICD_UBUNTU:-/opt/data/docker/cicd-ubuntu}
3030

3131
services:
32-
#================================================================================================
33-
# PORTAINER
34-
#================================================================================================
32+
#================================================================================================
33+
# PORTAINER
34+
#================================================================================================
3535
portainer:
3636
image: dockerframework/portainer:${PORTAINER_VERSION:-2.9}
3737
container_name: ${CONTAINER_PORTAINER:-devopscorner_portainer}
@@ -49,9 +49,9 @@ services:
4949
devopscorner_net:
5050
ipv4_address: ${CONTAINER_IP_PORTAINER:-172.146.146.5}
5151

52-
#================================================================================================
53-
# CICD-UBUNTU
54-
#================================================================================================
52+
#================================================================================================
53+
# CICD-UBUNTU
54+
#================================================================================================
5555
cicd-ubuntu:
5656
build:
5757
context: ./docker/cicd-ubuntu

‎compose/app-compose-ubuntu.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3.7'
1+
version: "3.7"
22

33
#================================================================================================
44
# NETWORK SETUP
@@ -29,9 +29,9 @@ volumes:
2929
device: ${DATA_UBUNTU:-/opt/data/docker/ubuntu}
3030

3131
services:
32-
#================================================================================================
33-
# PORTAINER
34-
#================================================================================================
32+
#================================================================================================
33+
# PORTAINER
34+
#================================================================================================
3535
portainer:
3636
image: dockerframework/portainer:${PORTAINER_VERSION:-2.9}
3737
container_name: ${CONTAINER_PORTAINER:-devopscorner_portainer}
@@ -49,9 +49,9 @@ services:
4949
devopscorner_net:
5050
ipv4_address: ${CONTAINER_IP_PORTAINER:-172.146.146.5}
5151

52-
#================================================================================================
53-
# UBUNTU
54-
#================================================================================================
52+
#================================================================================================
53+
# UBUNTU
54+
#================================================================================================
5555
ubuntu:
5656
# image: ubuntu:${UBUNTU_VERSION:-20.04}
5757
build:

‎compose/app-compose.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3.7'
1+
version: "3.7"
22

33
#================================================================================================
44
# NETWORK SETUP
@@ -41,9 +41,9 @@ volumes:
4141
device: ${DATA_CICD_ALPINE:-/opt/data/docker/cicd-alpine}
4242

4343
services:
44-
#================================================================================================
45-
# PORTAINER
46-
#================================================================================================
44+
#================================================================================================
45+
# PORTAINER
46+
#================================================================================================
4747
portainer:
4848
image: dockerframework/portainer:${PORTAINER_VERSION:-2.9}
4949
container_name: ${CONTAINER_PORTAINER:-devopscorner_portainer}
@@ -61,9 +61,9 @@ services:
6161
devopscorner_net:
6262
ipv4_address: ${CONTAINER_IP_PORTAINER:-172.146.146.5}
6363

64-
#================================================================================================
65-
# UBUNTU
66-
#================================================================================================
64+
#================================================================================================
65+
# UBUNTU
66+
#================================================================================================
6767
ubuntu:
6868
# image: ubuntu:${UBUNTU_VERSION:-20.04}
6969
build:
@@ -91,9 +91,9 @@ services:
9191
devopscorner_net:
9292
ipv4_address: ${CONTAINER_IP_UBUNTU:-172.146.146.212}
9393

94-
#================================================================================================
95-
# CICD-UBUNTU
96-
#================================================================================================
94+
#================================================================================================
95+
# CICD-UBUNTU
96+
#================================================================================================
9797
cicd-ubuntu:
9898
build:
9999
context: ./docker/cicd-ubuntu
@@ -120,9 +120,9 @@ services:
120120
devopscorner_net:
121121
ipv4_address: ${CONTAINER_IP_UBUNTU:-172.146.146.212}
122122

123-
#================================================================================================
124-
# CICD-ALPINE
125-
#================================================================================================
123+
#================================================================================================
124+
# CICD-ALPINE
125+
#================================================================================================
126126
cicd-alpine:
127127
build:
128128
context: ./docker/cicd-alpine
@@ -147,4 +147,4 @@ services:
147147
tty: true
148148
networks:
149149
devopscorner_net:
150-
ipv4_address: ${CONTAINER_IP_ALPINE:-172.146.146.213}
150+
ipv4_address: ${CONTAINER_IP_ALPINE:-172.146.146.213}

‎compose/docker/cicd-alpine/Dockerfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,28 +72,28 @@ RUN wget -O terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
7272
rm -f terraform_${TERRAFORM_VERSION}_linux_amd64.zip &&\
7373
# install terragrunt
7474
wget -O /usr/local/bin/terragrunt \
75-
https://github.com/gruntwork-io/terragrunt/releases/download/${TERRAGRUNT_VERSION}/terragrunt_linux_amd64 &&\
75+
https://github.com/gruntwork-io/terragrunt/releases/download/${TERRAGRUNT_VERSION}/terragrunt_linux_amd64 &&\
7676
chmod +x /usr/local/bin/terragrunt &&\
7777
# install packer
7878
wget -O packer_${PACKER_VERSION}_linux_amd64.zip \
79-
https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip &&\
79+
https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip &&\
8080
unzip packer_${PACKER_VERSION}_linux_amd64.zip -d /usr/local/bin &&\
8181
rm -f packer_${PACKER_VERSION}_linux_amd64.zip; sync
8282

8383
RUN python3 -m pip install pip==21.3.1 &&\
8484
pip3 install --upgrade pip cffi &&\
8585
# install ansible
8686
pip3 install --no-cache-dir \
87-
ansible-core==${ANSIBLE_VERSION} \
88-
ansible-tower-cli==3.3.4 \
89-
PyYaml \
90-
Jinja2 \
91-
httplib2 \
92-
six \
93-
requests \
94-
boto3 \
87+
ansible-core==${ANSIBLE_VERSION} \
88+
ansible-tower-cli==3.3.4 \
89+
PyYaml \
90+
Jinja2 \
91+
httplib2 \
92+
six \
93+
requests \
94+
boto3 \
9595
# install awscli
96-
awscli &&\
96+
awscli &&\
9797
# setup root .ssh directory
9898
mkdir -p /root/.ssh && chmod 0700 /root/.ssh && chown -R root. /root/.ssh
9999

‎compose/docker/cicd-alpine/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
IMAGE = YOUR_AWS_ACCOUNT.dkr.ecr.ap-southeast-1.amazonaws.com/devops/cicd
2-
TAG = 1.0.3
2+
TAG = alpine
33

44
clean-local:
55
docker rmi $(CLEAN_OPTIONS) $(IMAGE):$(TAG) || true

‎compose/docker/cicd-alpine/docker-build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ export IMAGE="$CI_REGISTRY/$CI_PROJECT_PATH/$CI_PROJECT_NAME"
1515
export TAG="alpine"
1616

1717
echo " Build Image => $IMAGE:$TAG"
18-
docker build . -t $IMAGE:$TAG
18+
docker build . -t $IMAGE:$TAG

‎compose/docker/cicd-alpine/docker-push.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ export IMAGE="$CI_REGISTRY/$CI_PROJECT_PATH/$CI_PROJECT_NAME"
1515
export TAG="alpine"
1616

1717
echo " Push Image => $IMAGE:$TAG"
18-
docker push $IMAGE:$TAG
18+
docker push $IMAGE:$TAG

‎compose/docker/cicd-alpine/rootfs/tmp/setup_awscli.sh‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
#!/usr/bin/env sh
22

33
apk add --no-cache \
4-
build-base \
5-
git \
6-
python3 \
7-
python3-dev \
8-
py3-pip
4+
build-base \
5+
git \
6+
python3 \
7+
python3-dev \
8+
py3-pip
99

10-
python3 -m pip install pip==21.3.1 &&\
11-
pip3 install --upgrade pip cffi &&\
12-
pip3 install --no-cache-dir \
13-
PyYaml \
14-
requests \
15-
boto3 \
16-
# install awscli
17-
awscli &&\
18-
# setup root .ssh directory
19-
mkdir -p /root/.ssh && chmod 0700 /root/.ssh && chown -R root. /root/.ssh
10+
python3 -m pip install pip==21.3.1 &&
11+
pip3 install --upgrade pip cffi &&
12+
pip3 install --no-cache-dir \
13+
PyYaml \
14+
requests \
15+
boto3
16+
17+
# install awscli
18+
awscli
19+
20+
# setup root .ssh directory
21+
mkdir -p /root/.ssh && chmod 0700 /root/.ssh && chown -R root. /root/.ssh

‎compose/docker/cicd-ubuntu/Dockerfile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,30 +76,30 @@ RUN apt-get install -y \
7676
awscli &&\
7777
# install terraform
7878
wget -O terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
79-
https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip &&\
79+
https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip &&\
8080
unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /usr/local/bin &&\
8181
rm -f terraform_${TERRAFORM_VERSION}_linux_amd64.zip &&\
8282
# install terragrunt
8383
wget -O /usr/local/bin/terragrunt \
84-
https://github.com/gruntwork-io/terragrunt/releases/download/${TERRAGRUNT_VERSION}/terragrunt_linux_amd64 &&\
84+
https://github.com/gruntwork-io/terragrunt/releases/download/${TERRAGRUNT_VERSION}/terragrunt_linux_amd64 &&\
8585
chmod +x /usr/local/bin/terragrunt &&\
8686
# install packer
8787
wget -O packer_${PACKER_VERSION}_linux_amd64.zip \
88-
https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip &&\
88+
https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip &&\
8989
unzip packer_${PACKER_VERSION}_linux_amd64.zip -d /usr/local/bin &&\
9090
rm -f packer_${PACKER_VERSION}_linux_amd64.zip; sync
9191

9292
RUN python3 -m pip install pip==21.3.1 &&\
9393
pip3 install --upgrade pip cffi &&\
9494
# install ansible
9595
pip3 install ansible-core==${ANSIBLE_VERSION} \
96-
ansible-tower-cli==3.3.4 \
97-
PyYaml \
98-
Jinja2 \
99-
httplib2 \
100-
six \
101-
requests \
102-
boto3 &&\
96+
ansible-tower-cli==3.3.4 \
97+
PyYaml \
98+
Jinja2 \
99+
httplib2 \
100+
six \
101+
requests \
102+
boto3 &&\
103103
# setup root .ssh directory
104104
mkdir -p /root/.ssh && chmod 0700 /root/.ssh && chown -R root. /root/.ssh
105105

0 commit comments

Comments
 (0)