From 9ca2ec1a9b6932da1a4973f153210863a79d25c8 Mon Sep 17 00:00:00 2001 From: Vishwajit Nagulkar <119565952+VishwajitNagulkar@users.noreply.github.com> Date: Tue, 3 Sep 2024 14:33:48 +0530 Subject: [PATCH 1/4] Update Dockerfile --- .docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 8f8d0db..9c06506 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -77,7 +77,7 @@ RUN apt install -y \ # ZSH ADD ./etc/install-zsh.sh /root/install-zsh.sh -ADD ./etc/install-zsh.sh /home/ubuntu/install-zsh.sh +ADD .docker/etc/install-zsh.sh /home/ubuntu/install-zsh.sh RUN chmod +x /root/install-zsh.sh RUN chmod +x /home/ubuntu/install-zsh.sh @@ -183,4 +183,4 @@ WORKDIR /home/ubuntu/workspace # Define default command. EXPOSE 22 -CMD ["/usr/sbin/sshd", "-D"] \ No newline at end of file +CMD ["/usr/sbin/sshd", "-D"] From e6d585ae7675c43caaf21a97af68f92bd2eb2869 Mon Sep 17 00:00:00 2001 From: Vishwajit Nagulkar <119565952+VishwajitNagulkar@users.noreply.github.com> Date: Tue, 3 Sep 2024 14:39:42 +0530 Subject: [PATCH 2/4] Update Dockerfile --- .docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 9c06506..3cc16f6 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -76,7 +76,7 @@ RUN apt install -y \ # ZSH -ADD ./etc/install-zsh.sh /root/install-zsh.sh +ADD .docker/etc/install-zsh.sh /root/install-zsh.sh ADD .docker/etc/install-zsh.sh /home/ubuntu/install-zsh.sh RUN chmod +x /root/install-zsh.sh From 6f96749195945dc5cdaec88dff9c4057f9094597 Mon Sep 17 00:00:00 2001 From: Vishwajit Nagulkar <119565952+VishwajitNagulkar@users.noreply.github.com> Date: Wed, 4 Sep 2024 00:17:12 +0530 Subject: [PATCH 3/4] test --- .github/workflows/sanity-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sanity-check.yaml b/.github/workflows/sanity-check.yaml index c62c2a3..124af29 100644 --- a/.github/workflows/sanity-check.yaml +++ b/.github/workflows/sanity-check.yaml @@ -15,7 +15,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Build the application image - run: docker build -t clouddrove/devops:0.0.${{ github.run_number }} ./docker-image/. + run: docker build -t clouddrove/devops:0.0.${{ github.run_number }} .docker/Dockerfile . - name: Bring container up and running run: docker run --name devops -d clouddrove/devops:0.0.${{ github.run_number }} From 55f007dcd242652cdc1a84ab652db253589931a7 Mon Sep 17 00:00:00 2001 From: Vishwajit Nagulkar <119565952+VishwajitNagulkar@users.noreply.github.com> Date: Wed, 4 Sep 2024 00:19:01 +0530 Subject: [PATCH 4/4] test --- .github/workflows/sanity-check.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sanity-check.yaml b/.github/workflows/sanity-check.yaml index 124af29..897cbab 100644 --- a/.github/workflows/sanity-check.yaml +++ b/.github/workflows/sanity-check.yaml @@ -15,8 +15,8 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Build the application image - run: docker build -t clouddrove/devops:0.0.${{ github.run_number }} .docker/Dockerfile . - + run: docker build -t clouddrove/devops:0.0.${{ github.run_number }} -f .docker/Dockerfile . + - name: Bring container up and running run: docker run --name devops -d clouddrove/devops:0.0.${{ github.run_number }}