Skip to content

Commit

Permalink
1.0.55 Issue #18: Replace apt with apt-get
Browse files Browse the repository at this point in the history
  • Loading branch information
webpwnized committed Oct 28, 2023
1 parent b9776e7 commit be0f92c
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 33 deletions.
19 changes: 14 additions & 5 deletions .github/workflows/scan-dockerfiles-with-hadolint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,26 @@ jobs:
uses: hadolint/[email protected]
with:
path: .
# when provided with a directory on output_path
# it will generate the specified reports file named 'results.{extension}'
# in this example it will generate: results.sarif
# Specify the directory to scan (in this case, the root directory).

dockerfile: Dockerfile
# Specify the name of the Dockerfile to be scanned.

recursive: true
# Enable recursive scanning to include subdirectories.

output-file: hadolint-results.sarif
# Define the name of the SARIF format output file.

no-fail: true
# Continue the workflow even if there are issues found (no-fail set to true).

format: 'sarif'
# Specify the format of the scan results, in this case, SARIF format.

failure-threshold: 'error'
continue-on-error: true

# Define the threshold for failure based on severity (e.g., 'error').
- name: Upload Results to GitHub Advanced Security Dashboard
uses: github/codeql-action/upload-sarif@v2
with:
Expand Down
9 changes: 4 additions & 5 deletions database/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ FROM mysql:debian
ENV MYSQL_ROOT_PASSWORD="mutillidae"

Check warning on line 7 in database/Dockerfile

View workflow job for this annotation

GitHub Actions / KICS Github Action

[HIGH] Passwords And Secrets - Generic Password

Query to find passwords and secrets in infrastructure code.

# Patch the container
RUN apt update && \
apt -y upgrade && \
apt -y autoremove && \
apt clean

RUN apt-get update && \
apt-get -y upgrade && \
apt-get -y autoremove && \
apt-get clean
8 changes: 4 additions & 4 deletions database_admin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ ENV PMA_USER="root"
ENV PMA_PASSWORD="mutillidae"

Check warning on line 13 in database_admin/Dockerfile

View workflow job for this annotation

GitHub Actions / KICS Github Action

[HIGH] Passwords And Secrets - Generic Password

Query to find passwords and secrets in infrastructure code.

# Patch the container
RUN apt update && \
apt -y upgrade && \
apt -y autoremove && \
apt clean
RUN apt-get update && \
apt-get -y upgrade && \
apt-get -y autoremove && \
apt-get clean

# Open port 80 to the webserver
EXPOSE 80
8 changes: 4 additions & 4 deletions ldap/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ENV LDAP_CONFIG_PASSWORD="mutillidae"
ENV LDAP_TLS="false"

# Patch the container
# RUN apt update && \
# apt -y upgrade && \
# apt -y autoremove && \
# apt clean
# RUN apt-get update && \
# apt-get -y upgrade && \
# apt-get -y autoremove && \
# apt-get clean
8 changes: 4 additions & 4 deletions ldap_admin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ ENV PHPLDAPADMIN_LDAP_HOSTS="directory"
ENV PHPLDAPADMIN_HTTPS="false"

# Patch the container
RUN apt update && \
apt -y upgrade && \
apt -y autoremove && \
apt clean
RUN apt-get update && \
apt-get -y upgrade && \
apt-get -y autoremove && \
apt-get clean

# Open port 80 through the firewall
EXPOSE 80
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.54
1.0.55
20 changes: 10 additions & 10 deletions www/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ ARG DATABASE_PORT="3306"
# uninstall git
# Patch the container
# Add the user for Lab #17
RUN apt update && \
apt install -y libldap2-dev && docker-php-ext-install ldap && \
apt install -y libxml2-dev && docker-php-ext-install xml && \
apt install -y libonig-dev && docker-php-ext-install mbstring && \
apt install -y libcurl4-openssl-dev && docker-php-ext-install curl && \
RUN apt-get update && \
apt-get install -y libldap2-dev && docker-php-ext-install ldap && \
apt-get install -y libxml2-dev && docker-php-ext-install xml && \
apt-get install -y libonig-dev && docker-php-ext-install mbstring && \
apt-get install -y libcurl4-openssl-dev && docker-php-ext-install curl && \
docker-php-ext-install mysqli && \
apt install -y dnsutils ntp iputils-ping git && \
apt-get install -y dnsutils ntp iputils-ping git && \
git clone https://github.com/webpwnized/mutillidae.git /var/www/mutillidae && \
apt remove -y git && \
apt -y upgrade && \
apt -y autoremove && \
apt clean && \
apt-get remove -y git && \
apt-get -y upgrade && \
apt-get -y autoremove && \
apt-get clean && \
useradd -M phinius -p 123456


Expand Down

0 comments on commit be0f92c

Please sign in to comment.