Skip to content

Commit

Permalink
1.0.67 Improve build resiliency
Browse files Browse the repository at this point in the history
  • Loading branch information
webpwnized committed Aug 15, 2024
1 parent b2270db commit da41bba
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .build/database/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Container image: webpwnized/mutillidae:database
# From project root, build with:
# docker build --file ./Dockerfile --tag webpwnized/mutillidae:database .build/database/
# docker build --file .build/database/Dockerfile --tag webpwnized/mutillidae:database .build/database/
# docker build: This is the command to build a Docker image.
# --file .build/database/Dockerfile: This specifies the path to the Dockerfile you want to use. In this case, it's .build/database/Dockerfile.
# --tag webpwnized/mutillidae:database: This tags the resulting Docker image with a name (webpwnized/mutillidae) and a tag (database).
Expand Down
2 changes: 1 addition & 1 deletion .build/database_admin/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Container image: webpwnized/mutillidae:database_admin
# From project root, build with:
# docker build --file ./Dockerfile --tag webpwnized/mutillidae:database_admin .build/database_admin/
# docker build --file .build/database_admin/Dockerfile --tag webpwnized/mutillidae:database_admin .build/database_admin/
# docker build: This is the command to build a Docker image.
# --file .build/database_admin/Dockerfile: This specifies the path to the Dockerfile you want to use. In this case, it's .build/database_admin/Dockerfile.
# --tag webpwnized/mutillidae:database_admin: This tags the resulting Docker image with a name (webpwnized/mutillidae) and a tag (database_admin).
Expand Down
2 changes: 1 addition & 1 deletion .build/ldap/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Container image: webpwnized/mutillidae:ldap
# From project root, build with:
# docker build --file ./Dockerfile --tag webpwnized/mutillidae:ldap .build/ldap/
# docker build --file .build/ldap/Dockerfile --tag webpwnized/mutillidae:ldap .build/ldap/
#
# docker build: This is the command to build a Docker image.
# --file .build/ldap/Dockerfile: This specifies the path to the Dockerfile you want to use. In this case, it's .build/ldap/Dockerfile.
Expand Down
2 changes: 1 addition & 1 deletion .build/ldap_admin/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Container image: webpwnized/mutillidae:ldap_admin
# From project root, build with:
# docker build --file ./Dockerfile --tag webpwnized/mutillidae:ldap_admin .build/ldap_admin/
# docker build --file .build/ldap_admin/Dockerfile --tag webpwnized/mutillidae:ldap_admin .build/ldap_admin/
#
# docker build: This is the command to build a Docker image.
# --file .build/ldap_admin/Dockerfile: This specifies the path to the Dockerfile you want to use. In this case, it's .build/ldap_admin/Dockerfile.
Expand Down
4 changes: 2 additions & 2 deletions .build/www/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Container image: webpwnized/mutillidae:www
# From project root, build with:
# docker build --file ./Dockerfile --tag webpwnized/mutillidae:www .build/www/
# docker build --file .build/www/Dockerfile --tag webpwnized/mutillidae:www .build/www/
# docker build: This is the command to build a Docker image.
# --file .build/www/Dockerfile: This specifies the path to the Dockerfile you want to use. In this case, it's .build/www/Dockerfile.
# --tag webpwnized/mutillidae:www: This tags the resulting Docker image with a name (webpwnized/mutillidae) and a tag (www).
# .: This is the build context. It indicates the directory to be used for the build process. The Docker daemon will send this directory's contents to the Docker engine. In this case, the dot represents the current directory.
#
# From project root, run with:
# docker compose -f .build/docker-compose.yml up --build --detach
# docker compose --file .build/docker-compose.yml up --build --detach
# docker-compose: This is the Docker Compose command-line tool used for managing multi-container Docker applications.
# --file .build/docker-compose.yml: This option (--file or -f) specifies the path to the docker-compose.yml file. In this case, it’s located at .build/docker-compose.yml.
# up: This subcommand tells Docker Compose to create and start the containers defined in the docker-compose.yml file. If the containers do not exist, they will be created. If they already exist, they will be started.
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/build-and-push-to-dockerhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,12 @@ jobs:
echo "VERSION=$VERSION" >> $GITHUB_ENV
shell: bash

- name: Print Working Directory
- name: Print Directory Information
id: print_current_directory
run: |
echo ""
echo "STATUS: Current directory:$(pwd)"
echo "STATUS: Directory contents:$(ls -la)"
echo ""
echo "STATUS: Directory contents:"
echo "$(ls -la)"
shell: bash

# Step 3: Set up QEMU on the runner.
Expand Down Expand Up @@ -81,7 +80,7 @@ jobs:
- name: Build and Load Container
uses: docker/build-push-action@master
with:
context: .
context: .build/${{ matrix.container_name }}/
file: .build/${{ matrix.container_name }}/Dockerfile
load: true
tags: webpwnized/mutillidae:${{ matrix.container_name }}
Expand All @@ -108,15 +107,15 @@ jobs:
- name: Push Container
uses: docker/build-push-action@master
with:
context: .
context: .build/${{ matrix.container_name }}/
file: .build/${{ matrix.container_name }}/Dockerfile
push: true
tags: webpwnized/mutillidae:${{ matrix.container_name }}

- name: Push Container with version number
uses: docker/build-push-action@master
with:
context: .
context: .build/${{ matrix.container_name }}/
file: .build/${{ matrix.container_name }}/Dockerfile
push: true
tags: webpwnized/mutillidae:${{ matrix.container_name }}-${{ env.VERSION }}

0 comments on commit da41bba

Please sign in to comment.