Paths

Table of Contentst

Diffusion Comm 370381a0bf4c

tunnelbroker: Merge tunnelbroker-base and tunnelbroker-server images
370381a0bf4c
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

tunnelbroker: Merge tunnelbroker-base and tunnelbroker-server images

Summary:
Discussed with karol-bisztyga in chat that the original reason for splitting the images was for layer caching. This resolves the layer caching problem and merges the images.

This also removes the base image from docker-compose.yml, requiring that scripts/build_base_image.sh be run explicitly before docker-compose commands or implicitly using the run and test scripts.

I merged/flattened the directory structures in a way that I like, but this is open to discussion.

Only does this for one service, tunnelbroker, as it is a proof-of-concept in a series of diffs.

Test Plan: Run tunnelbroker service launch script

Reviewers: geekbrother, karol-bisztyga, varun, ashoat

Reviewed By: geekbrother, karol-bisztyga, ashoat

Subscribers: palys-swm, Adrian, atul, benschac

Differential Revision: https://phabricator.ashoat.com/D3234

Details

Provenance

Authored on Mar 4 2022, 12:40 PM

Reviewer

Differential Revision

D3234: tunnelbroker: Merge tunnelbroker-base and tunnelbroker-server images

Parents

rCOMM71290bcc073c: [web] [chore] add remaining icons to the project icon component

Branches

Unknown

Tags

Unknown

Event Timeline

• jim committed rCOMM370381a0bf4c: tunnelbroker: Merge tunnelbroker-base and tunnelbroker-server images (authored by • jim).Mar 10 2022, 8:17 AM

• jim added an edge: D3234: tunnelbroker: Merge tunnelbroker-base and tunnelbroker-server images.

Changes (112)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

services/

blob/

docker-base/

docker-compose.yml

scripts/

build_base_image.sh

tunnelbroker/


	docker-server/	contents/	server/

AmqpManager.cpp

DatabaseEntitiesTools.cpp

DatabaseEntitiesTools.h

DatabaseManager.cpp

DatabaseManager.h

DeviceSessionItem.cpp

DeviceSessionItem.h

MessageItem.cpp

PublicKeyItem.cpp

PublicKeyItem.h

SessionSignItem.cpp

SessionSignItem.h

DeliveryBroker.cpp

DeliveryBroker.h

DeliveryBrokerEntites.h

TunnelbrokerServiceImpl.cpp

TunnelbrokerServiceImpl.h

ConfigManager.cpp

ConfigManager.h

CryptoTools.cpp

TunnelBrokerTest.cpp

install_amqp_cpp.sh

install_aws_sdk.sh

install_cryptopp.sh

install_folly.sh

install_libuv.sh

build_server.sh

AmqpManager.cpp

DatabaseEntitiesTools.cpp

DatabaseEntitiesTools.h

DatabaseManager.cpp

DatabaseManager.h

DeviceSessionItem.cpp

DeviceSessionItem.h

MessageItem.cpp

PublicKeyItem.cpp

PublicKeyItem.h

SessionSignItem.cpp

SessionSignItem.h

DeliveryBroker.cpp

DeliveryBroker.h

DeliveryBrokerEntites.h

TunnelbrokerServiceImpl.cpp

TunnelbrokerServiceImpl.h

ConfigManager.cpp

ConfigManager.h

CryptoTools.cpp

TunnelBrokerTest.cpp

	docker/
	docker-server/	contents/

build_server.sh

	docker/
	docker-base/	contents/

install_amqp_cpp.sh

install_aws_sdk.sh

install_cryptopp.sh

install_folly.sh

install_libuv.sh

rCOMM370381a0bf4c

services/blob/docker-base/Dockerfile

services/docker-compose.yml

services/package.json

services/scripts/build_base_image.sh

services/tunnelbroker/.dockerignore

services/tunnelbroker/CMakeLists.txt

services/tunnelbroker/Dockerfile

services/tunnelbroker/build.sh

services/tunnelbroker/docker-base

services/tunnelbroker/docker-base/Dockerfile

services/tunnelbroker/docker-base/contents

services/tunnelbroker/docker-base/contents/install_amqp_cpp.sh

services/tunnelbroker/docker-base/contents/install_aws_sdk.sh

services/tunnelbroker/docker-base/contents/install_cryptopp.sh

services/tunnelbroker/docker-base/contents/install_folly.sh

services/tunnelbroker/docker-base/contents/install_libuv.sh

services/tunnelbroker/docker-server

services/tunnelbroker/docker-server/Dockerfile

services/tunnelbroker/docker-server/contents

services/tunnelbroker/docker-server/contents/build_server.sh

services/tunnelbroker/docker-server/contents/run_server.sh

services/tunnelbroker/docker-server/contents/run_tests.sh

services/tunnelbroker/docker-server/contents/server

services/tunnelbroker/docker-server/contents/server/CMakeLists.txt

services/tunnelbroker/docker-server/contents/server/build.sh

services/tunnelbroker/docker-server/contents/server/generate.sh

services/tunnelbroker/docker-server/contents/server/src/Amqp/AmqpManager.cpp

services/tunnelbroker/docker-server/contents/server/src/Amqp/AmqpManager.h

services/tunnelbroker/docker-server/contents/server/src/Constants.h

services/tunnelbroker/docker-server/contents/server/src/Database/DatabaseEntitiesTools.cpp

services/tunnelbroker/docker-server/contents/server/src/Database/DatabaseEntitiesTools.h

services/tunnelbroker/docker-server/contents/server/src/Database/DatabaseManager.cpp

services/tunnelbroker/docker-server/contents/server/src/Database/DatabaseManager.h

services/tunnelbroker/docker-server/contents/server/src/Database/DeviceSessionItem.cpp

services/tunnelbroker/docker-server/contents/server/src/Database/DeviceSessionItem.h

services/tunnelbroker/docker-server/contents/server/src/Database/Item.h

services/tunnelbroker/docker-server/contents/server/src/Database/MessageItem.cpp

services/tunnelbroker/docker-server/contents/server/src/Database/MessageItem.h

services/tunnelbroker/docker-server/contents/server/src/Database/PublicKeyItem.cpp

services/tunnelbroker/docker-server/contents/server/src/Database/PublicKeyItem.h

services/tunnelbroker/docker-server/contents/server/src/Database/SessionSignItem.cpp

services/tunnelbroker/docker-server/contents/server/src/Database/SessionSignItem.h

services/tunnelbroker/docker-server/contents/server/src/DeliveryBroker/DeliveryBroker.cpp

services/tunnelbroker/docker-server/contents/server/src/DeliveryBroker/DeliveryBroker.h

services/tunnelbroker/docker-server/contents/server/src/DeliveryBroker/DeliveryBrokerEntites.h

services/tunnelbroker/docker-server/contents/server/src/Service/TunnelbrokerServiceImpl.cpp

services/tunnelbroker/docker-server/contents/server/src/Service/TunnelbrokerServiceImpl.h

services/tunnelbroker/docker-server/contents/server/src/Tools/AwsTools.cpp

services/tunnelbroker/docker-server/contents/server/src/Tools/AwsTools.h

services/tunnelbroker/docker-server/contents/server/src/Tools/ConfigManager.cpp

services/tunnelbroker/docker-server/contents/server/src/Tools/ConfigManager.h

services/tunnelbroker/docker-server/contents/server/src/Tools/CryptoTools.cpp

services/tunnelbroker/docker-server/contents/server/src/Tools/CryptoTools.h

services/tunnelbroker/docker-server/contents/server/src/Tools/Tools.cpp

services/tunnelbroker/docker-server/contents/server/src/Tools/Tools.h

services/tunnelbroker/docker-server/contents/server/src/server.cpp

services/tunnelbroker/docker-server/contents/server/test/TunnelBrokerTest.cpp

services/tunnelbroker/docker/build_server.sh

services/tunnelbroker/docker/install_amqp_cpp.sh

services/tunnelbroker/docker/install_aws_sdk.sh

services/tunnelbroker/docker/install_cryptopp.sh

services/tunnelbroker/docker/install_folly.sh

services/tunnelbroker/docker/install_libuv.sh

services/tunnelbroker/docker/run_server.sh

services/tunnelbroker/docker/run_tests.sh

services/tunnelbroker/generate.sh

services/tunnelbroker/src/Amqp/AmqpManager.cpp

services/tunnelbroker/src/Amqp/AmqpManager.h

services/tunnelbroker/src/Constants.h

services/tunnelbroker/src/Database/DatabaseEntitiesTools.cpp

services/tunnelbroker/src/Database/DatabaseEntitiesTools.h

services/tunnelbroker/src/Database/DatabaseManager.cpp

services/tunnelbroker/src/Database/DatabaseManager.h

services/tunnelbroker/src/Database/DeviceSessionItem.cpp

services/tunnelbroker/src/Database/DeviceSessionItem.h

services/tunnelbroker/src/Database/Item.h

services/tunnelbroker/src/Database/MessageItem.cpp

services/tunnelbroker/src/Database/MessageItem.h

services/tunnelbroker/src/Database/PublicKeyItem.cpp

services/tunnelbroker/src/Database/PublicKeyItem.h

services/tunnelbroker/src/Database/SessionSignItem.cpp

services/tunnelbroker/src/Database/SessionSignItem.h

services/tunnelbroker/src/DeliveryBroker/DeliveryBroker.cpp

services/tunnelbroker/src/DeliveryBroker/DeliveryBroker.h

services/tunnelbroker/src/DeliveryBroker/DeliveryBrokerEntites.h

services/tunnelbroker/src/Service/TunnelbrokerServiceImpl.cpp

services/tunnelbroker/src/Service/TunnelbrokerServiceImpl.h

services/tunnelbroker/src/Tools/AwsTools.cpp

services/tunnelbroker/src/Tools/AwsTools.h

services/tunnelbroker/src/Tools/ConfigManager.cpp

services/tunnelbroker/src/Tools/ConfigManager.h

services/tunnelbroker/src/Tools/CryptoTools.cpp

services/tunnelbroker/src/Tools/CryptoTools.h

services/tunnelbroker/src/Tools/Tools.cpp

services/tunnelbroker/src/Tools/Tools.h

services/tunnelbroker/src/server.cpp

services/tunnelbroker/test/TunnelBrokerTest.cpp