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.

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

modified: configuration/arm64/docker-compose.yml #585

Merged
merged 8 commits into from
May 1, 2024
Merged

Conversation

jwillmartin
Copy link
Contributor

@jwillmartin jwillmartin commented Mar 20, 2024

modified:   configuration/arm64/initialization.sh
modified:   configuration/arm64/mysql/add_v2xhub_user.bash

PR Details

Description

Updated arm64 configuration files to fix initial setup, which was no longer working.

Updated:
mariabd-client version
docker compose version
docker-compose.yml

Related Issue

#594

Motivation and Context

The initialization.sh and add_v2xhub_user.bash scripts were no longer working in arm64 configuration

How Has This Been Tested?

Tested on latest Raspberry Pi OS on a Pi 4. Initialization and user addition worked.

Types of changes

  • Defect fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that cause existing functionality to change)

Checklist:

  • I have added any new packages to the sonar-scanner.properties file
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
    V2XHUB Contributing Guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

	modified:   configuration/arm64/initialization.sh
	modified:   configuration/arm64/mysql/add_v2xhub_user.bash
@@ -1,5 +1,3 @@
version: '3.7'
Copy link
Contributor

Choose a reason for hiding this comment

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

@jwillmartin Why are we removing this version

Copy link
Contributor Author

@jwillmartin jwillmartin Mar 21, 2024

Choose a reason for hiding this comment

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

@paulbourelly999 It was throwing a compatibility warning when running docker compose. I read through their documentation and the versioning is optional/doesn't do anything.

Copy link
Contributor

Choose a reason for hiding this comment

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

Add this back

@@ -16,14 +14,15 @@ services:
- mysql_root_password
volumes:
- ./mysql/localhost.sql:/docker-entrypoint-initdb.d/localhost.sql
- ./mysql/port_drayage.sql:/docker-entrypoint-initdb.d/port_drayage.sql
# - ./mysql/port_drayage.sql:/docker-entrypoint-initdb.d/port_drayage.sql
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the idea here that we do not want to default to having port drayage functionality on?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@paulbourelly999 Yeah. It's not used by anybody at the moment. It'll be better to have it commented out unless somebody will use it.

Copy link
Contributor

Choose a reason for hiding this comment

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

Leave a comment indicating how to get port drayage functionality back and/or to come up with a more elegant solution to not including port drayage by default.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added comments with instructions

Copy link
Collaborator

Choose a reason for hiding this comment

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

All, I think we need to leave the port_drayage as is. The expectation is that whatever was deployed in the past should be backwards compatible or scenarios would continue to work as is, unless we notify the client we're removing this feature or retiring it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed back

@paulbourelly999 paulbourelly999 self-requested a review March 21, 2024 17:15
Copy link
Contributor

@paulbourelly999 paulbourelly999 left a comment

Choose a reason for hiding this comment

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

@jwillmartin Make the changes we talked about and then I am good to merge.

@paulbourelly999
Copy link
Contributor

@jwillmartin Also may want to create a github issue for documentation of what errors were encountered and triggered this change.

sudo pip3 install docker-compose
sudo apt update -y && sudo apt upgrade -y
sudo docker-compose up -d
for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; do sudo apt-get remove $pkg; done
Copy link
Contributor Author

@jwillmartin jwillmartin Mar 25, 2024

Choose a reason for hiding this comment

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

Was getting warnings about gpg key deprecation. Updated and tested using Docker's official Debian installation steps

Copy link
Collaborator

@maefromm maefromm left a comment

Choose a reason for hiding this comment

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

All, any changes that are done in arm64 that applies to amd64 should be done together and changes should be integration tested to make sure it works as expected without introducing any new issues.

@@ -16,14 +14,15 @@ services:
- mysql_root_password
volumes:
- ./mysql/localhost.sql:/docker-entrypoint-initdb.d/localhost.sql
- ./mysql/port_drayage.sql:/docker-entrypoint-initdb.d/port_drayage.sql
# - ./mysql/port_drayage.sql:/docker-entrypoint-initdb.d/port_drayage.sql
Copy link
Collaborator

Choose a reason for hiding this comment

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

All, I think we need to leave the port_drayage as is. The expectation is that whatever was deployed in the past should be backwards compatible or scenarios would continue to work as is, unless we notify the client we're removing this feature or retiring it.

	modified:   configuration/amd64/initialization.sh
	modified:   configuration/arm64/docker-compose.yml
	modified:   configuration/arm64/initialization.sh
sudo apt update -y && sudo apt upgrade -y

#installing necessary and useful apps
sudo apt-get install chromium-browser -y #Chrome required for CARMA platform/V2X Hub UI(?)
sudo apt install curl -y #Curl for downloading files over internet
Copy link
Contributor

Choose a reason for hiding this comment

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

Why as curl removed. Is it not used?

Copy link
Contributor

Choose a reason for hiding this comment

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

This needs to be added back. It is still used

sudo apt-get update
sudo apt-get install ca-certificates curl
sudo install -m 0755 -d /etc/apt/keyrings
sudo curl -fsSL https://download.docker.com/linux/$(. /etc/os-release && echo "$ID")/gpg -o /etc/apt/keyrings/docker.asc
Copy link
Contributor

Choose a reason for hiding this comment

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

Add curl back so this script does not fail for people without curl installed.

sudo apt update -y && sudo apt upgrade -y

#installing necessary and useful apps
sudo apt-get install chromium-browser -y #Chrome required for CARMA platform/V2X Hub UI(?)
sudo apt install curl -y #Curl for downloading files over internet
Copy link
Contributor

Choose a reason for hiding this comment

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

Add curl back. See comments above.

Copy link
Contributor

@paulbourelly999 paulbourelly999 left a comment

Choose a reason for hiding this comment

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

Only thing left is to add curl back.

Copy link

sonarcloud bot commented Apr 18, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@paulbourelly999 paulbourelly999 merged commit 326bac2 into develop May 1, 2024
3 of 4 checks passed
@paulbourelly999 paulbourelly999 deleted the fix-arm64 branch May 1, 2024 13:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants