Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: update to latest ddev (v1.22.7) #145

Closed
wants to merge 1 commit into from
Closed

fix: update to latest ddev (v1.22.7) #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .ddev/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: DrupalPod
type: drupal10
docroot: web
php_version: "8.1"
php_version: "8.3"
webserver_type: nginx-fpm
xdebug_enabled: false
additional_hostnames: []
additional_fqdns: []
database:
type: mariadb
version: "10.4"
version: "10.6"
use_dns_when_possible: true
composer_version: "2"
web_environment: []
Expand Down Expand Up @@ -274,5 +274,6 @@ web_environment: []
# for them. Example:
#hooks:
# post-import-db:
# - exec: drush cr
# - exec: drush updb
# - exec: drush sql:sanitize
# - exec: drush updatedb
# - exec: drush cache:rebuild
2 changes: 1 addition & 1 deletion .gitpod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: drupalpod/drupalpod-gitpod-base:20231222
image: drupalpod/drupalpod-gitpod-base:20240306

# DDEV and composer are running as part of the prebuild
# when starting a workspace all docker images are ready
Expand Down
6 changes: 3 additions & 3 deletions .gitpod/images/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/ddev.gpg] https://pkg.ddev.com/apt/ *
RUN sudo apt update && sudo apt install -y ddev

# Install GitUI (terminal-ui for git)
RUN wget https://github.com/extrawurst/gitui/releases/download/v0.24.3/gitui-linux-musl.tar.gz -P /tmp
RUN wget https://github.com/extrawurst/gitui/releases/download/v0.25.1/gitui-linux-musl.tar.gz -P /tmp
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The command to download GitUI uses a hard-coded version (v0.25.1). Consider using a variable for the version number to make future updates easier.

- RUN wget https://github.com/extrawurst/gitui/releases/download/v0.25.1/gitui-linux-musl.tar.gz -P /tmp
+ ARG GITUI_VERSION=v0.25.1
+ RUN wget https://github.com/extrawurst/gitui/releases/download/${GITUI_VERSION}/gitui-linux-musl.tar.gz -P /tmp
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
RUN wget https://github.com/extrawurst/gitui/releases/download/v0.25.1/gitui-linux-musl.tar.gz -P /tmp
ARG GITUI_VERSION=v0.25.1
RUN wget https://github.com/extrawurst/gitui/releases/download/${GITUI_VERSION}/gitui-linux-musl.tar.gz -P /tmp

RUN sudo tar xzf /tmp/gitui-linux-musl.tar.gz -C /usr/bin

# (get latest Minio version from https://dl.min.io/client/mc/release/linux-amd64/)
# Install Minio client
RUN wget https://dl.min.io/client/mc/release/linux-amd64/mcli_20231220071422.0.0_amd64.deb
RUN sudo dpkg -i mcli_20231220071422.0.0_amd64.deb
RUN wget https://dl.min.io/client/mc/release/linux-amd64/mcli_20240303001308.0.0_amd64.deb
RUN sudo dpkg -i mcli_20240303001308.0.0_amd64.deb
Comment on lines +23 to +24
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Minio client installation uses a specific version (20240303001308.0.0). Similar to GitUI, consider using a variable for the version number to simplify updates.

- RUN wget https://dl.min.io/client/mc/release/linux-amd64/mcli_20240303001308.0.0_amd64.deb
+ ARG MINIO_CLIENT_VERSION=20240303001308.0.0
+ RUN wget https://dl.min.io/client/mc/release/linux-amd64/mcli_${MINIO_CLIENT_VERSION}_amd64.deb
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
RUN wget https://dl.min.io/client/mc/release/linux-amd64/mcli_20240303001308.0.0_amd64.deb
RUN sudo dpkg -i mcli_20240303001308.0.0_amd64.deb
ARG MINIO_CLIENT_VERSION=20240303001308.0.0
RUN wget https://dl.min.io/client/mc/release/linux-amd64/mcli_${MINIO_CLIENT_VERSION}_amd64.deb
RUN sudo dpkg -i mcli_20240303001308.0.0_amd64.deb

RUN sudo mv /usr/local/bin/mcli /usr/local/bin/mc

# End workspace-base
Comment on lines 15 to 27
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📝 NOTE
This review was outside the diff hunks and was mapped to the diff hunk with the greatest overlap. Original lines [4-25]

Using sudo in Dockerfiles is generally discouraged as it can introduce security vulnerabilities and configuration errors. Since the Dockerfile switches to the gitpod user and then back to using sudo, consider optimizing these commands to run as the root user directly where possible, and then switch to the gitpod user only when necessary.

Expand Down
Loading