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

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

Merged
merged 8 commits into from
May 1, 2024
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d9c29df
modified: configuration/arm64/docker-compose.yml
jwillmartin Mar 20, 2024
49a43ad
Merge remote-tracking branch 'origin' into fix-arm64
jwillmartin Mar 20, 2024
b4f7638
Merge remote-tracking branch 'origin' into fix-arm64
jwillmartin Mar 25, 2024
12d665a
modified: configuration/arm64/docker-compose.yml
jwillmartin Mar 25, 2024
a30e860
Update docker-compose.yml
jwillmartin Mar 25, 2024
607b719
Merge remote-tracking branch 'origin' into fix-arm64
jwillmartin Apr 4, 2024
e10ea50
modified: configuration/amd64/docker-compose.yml
jwillmartin Apr 4, 2024
d7a8bc7
Merge remote-tracking branch 'origin' into fix-arm64
jwillmartin Apr 18, 2024
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
17 changes: 8 additions & 9 deletions configuration/arm64/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 •
edited
Loading

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

services:
db:
image: mariadb:10.4
Expand All @@ -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
- mysql-datavolume:/var/lib/mysql
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


php:
image: usdotfhwaops/php_arm:latest
container_name: php
network_mode: host
depends_on:
restart: always
depends_on:
- db
- v2xhub
stdin_open: true
Expand All @@ -34,7 +33,7 @@ services:
container_name: v2xhub
network_mode: host
restart: always
depends_on:
depends_on:
- db
environment:
- MYSQL_PASSWORD=/run/secrets/mysql_password
Expand All @@ -43,10 +42,10 @@ services:
volumes:
- ./logs:/var/log/tmx
- ./MAP:/var/www/plugins/MAP
port_drayage_webservice:
image: usdotfhwaops/port-drayage-webservice_arm:latest
container_name: port_drayage_webservice
network_mode: host
# port_drayage_webservice:
# image: usdotfhwaops/port-drayage-webservice_arm:latest
# container_name: port_drayage_webservice
# network_mode: host
secrets:
mysql_password:
file: ./secrets/mysql_password.txt
Expand Down
7 changes: 1 addition & 6 deletions configuration/arm64/initialization.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ sudo apt update -y && sudo apt upgrade -y
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.


#install docker
curl -L https://raw.githubusercontent.com/usdot-fhwa-stol/carma-platform/develop/engineering_tools/install-docker.sh | bash
paulbourelly999 marked this conversation as resolved.
Show resolved Hide resolved

#make passwords for mysql
mkdir -p secrets && cd secrets

Expand Down Expand Up @@ -45,10 +42,8 @@ arch=$(dpkg --print-architecture)
curl -fsSL https://download.docker.com/linux/$OS/gpg | sudo apt-key add -
sudo add-apt-repository "deb [arch=$arch] https://download.docker.com/linux/$OS $(lsb_release -cs) stable"
sudo apt-get -y install docker-ce docker-ce-cli containerd.io docker-compose-plugin
sudo apt -y install python3-pip
sudo pip3 install docker-compose
sudo apt update -y && sudo apt upgrade -y
sudo docker-compose up -d
sudo docker compose up -d

#create v2xhub user
cd $mysqlDir
Expand Down
2 changes: 1 addition & 1 deletion configuration/arm64/mysql/add_v2xhub_user.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ arch=$(dpkg --print-architecture)
if [ $arch = "amd64" ]; then
REQUIRED_PKG="mysql-client"
else
REQUIRED_PKG="mariadb-client-10.5"
REQUIRED_PKG="mariadb-client"
paulbourelly999 marked this conversation as resolved.
Show resolved Hide resolved
fi
PKG_OK=$(dpkg-query -W --showformat='${Status}\n' $REQUIRED_PKG|grep "install ok installed")
echo Checking for $REQUIRED_PKG: $PKG_OK
Expand Down
Loading