Details

Reviewers

• max
• karol
varun
ashoat

Commits

rCOMM370381a0bf4c: 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

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

• jim created this revision.Feb 16 2022, 12:13 PM

Herald added subscribers: • benschac, atul, • adrian, tomek. · View Herald TranscriptFeb 16 2022, 12:13 PM

tunnelbroker: Merge tunnelbroker-base and tunnelbroker-server images
services: Remove base image from docker-compose services
tunnelbroker: Reorganize code structure

Harbormaster completed remote builds in B6900: Diff 9751.Feb 16 2022, 12:18 PM

• jim edited the summary of this revision. (Show Details)Feb 16 2022, 12:18 PM

• jim edited the summary of this revision. (Show Details)

Harbormaster completed remote builds in B6901: Diff 9753.Feb 16 2022, 12:20 PM

• jim requested review of this revision.Feb 16 2022, 12:20 PM

• jim added a parent revision: D3233: services: Use .env file for docker-compose.Feb 16 2022, 12:20 PM

• jim added a child revision: D3236: tunnelbroker: Generate gRPC/protobuf code with CMake.Feb 16 2022, 12:28 PM

I think it would be good to introduce this change after we fully release the services. We don't even have tests for tunnelbroker... It would be good to first have a code that works well and only then refactor the structure. But that's just my opinion about this.

Given that this is just a change to the environment, I think testing that the image builds and the container can be launched with the service running is a good enough test. Though this diff in the stack in particular is more of a proposal and maybe should be delayed until a similar change is ready for the other services so that they all have the same code structure.

I think it would be good to introduce this change after we fully release the services. We don't even have tests for tunnelbroker... It would be good to first have a code that works well and only then refactor the structure. But that's just my opinion about this.

Given the amount of work it probably took to put this up, and given we want to make this change sooner or later, I think it makes sense to land now.

@karol-bisztyga and @geekbrother, can you each give it a full review? The two of you have the most context on this code.

I'm unable to patch this diff, can you rebase?

This revision now requires changes to proceed.Feb 25 2022, 12:28 AM

Fix blob service base to not depend on tunnelbroker

Harbormaster completed remote builds in B7053: Diff 9942.Feb 27 2022, 8:57 AM

@karol-bisztyga Rebased, you should be able to patch now

• jim mentioned this in D3236: tunnelbroker: Generate gRPC/protobuf code with CMake.Feb 28 2022, 11:35 AM

• karol requested changes to this revision.Mar 2 2022, 8:46 AM

• karol added inline comments.

services/blob/docker-base/Dockerfile
3 ↗	(On Diff #9942)	I don't think we should add changes for other services when this is only for tunnelbroker.
services/package.json
7 ↗	(On Diff #9942)	why is this removed?
services/scripts/build_base_image.sh
6 ↗	(On Diff #9942)	why are you using `>&2`?
services/tunnelbroker/Dockerfile
14–27 ↗	(On Diff #9942)	I think it's better to copy the entire folder at once. What's the reason for separating these?
34–36 ↗	(On Diff #9942)	Any reason these `COPY` instructions are here, separated, explicitly declaring every single file? Also, in the end, you copy the entire folder anyway, so what's the point of all prior copies?

This revision now requires changes to proceed.Mar 2 2022, 8:46 AM

• jim requested review of this revision.Mar 2 2022, 9:05 AM

• jim added inline comments.

services/blob/docker-base/Dockerfile
3 ↗	(On Diff #9942)	This seems like a clear typo to me which broke the blob service build after the tunnelbroker source files were reorganized. I say it's a typo because there's an install_folly.sh script in blob contents which is unused. And the blob service shouldn't depend on tunnelbroker source anyway.
services/package.json
7 ↗	(On Diff #9942)	`build_base_image` is changed to only build the base image. And to build all, you can just do `docker-compose build`. If you want I can put back in an entry like `"build-all": "./scripts/build_base_image.sh && docker-compose build"`.
services/scripts/build_base_image.sh
6 ↗	(On Diff #9942)	I generally print to stderr before exiting with an error code. I'm fine removing this though, doesn't make much of a difference.
services/tunnelbroker/Dockerfile
14–27 ↗	(On Diff #9942)	To preserve the build cache. See https://linear.app/comm/issue/ENG-771/tunnelbroker-base-image-cache-inefficiency
34–36 ↗	(On Diff #9942)	I wanted to rename the `docker` directory to `scripts` inside the container. Just makes more sense to me since it's more descriptive within the context of the Docker container. COPYs are cheap anyway.

Is there a task for refactoring all other services?

Back to your queue.

services/package.json
7 ↗	(On Diff #9942)	The idea is to let developers perform any actions using these yarn scripts. Ideally, they won't have to do anything manually(`docker ...`, `docker-compose ...`, etc). We just have to assume the developer who wants to work on services has zero knowledge of docker, even when it comes to invoking a simple command, so they can just use the API from these scripts. I now see we miss an alias for `docker-compose down` in these scripts.
services/scripts/build_base_image.sh
6 ↗	(On Diff #9942)	I think we should either use it everywhere or nowhere. For now, it seems it's just in this one place, that makes the code inconsistent with the rest of the codebase.
services/tunnelbroker/Dockerfile
14–27 ↗	(On Diff #9942)	I see, nice, I think we should apply this to the rest of the services as well.
34–36 ↗	(On Diff #9942)	Why is it even called "docker" on the host machine? I understand it contains scripts, so why not call this just "scripts"? The name "docker" does not make sense to me in the first place.

This revision now requires changes to proceed.Mar 4 2022, 3:22 AM

Address review comments

Harbormaster failed remote builds in B7164: Diff 10090!Mar 4 2022, 12:42 PM

Rebased and addressed comments

In D3234#89832, @karol-bisztyga wrote:

Is there a task for refactoring all other services?

https://linear.app/comm/issue/ENG-771/service-base-image-cache-inefficiency and https://linear.app/comm/issue/ENG-777/generate-grpcproto-code-as-cmake-target for the next one in the stack apply to all services (I edited the issue name on the first one).

services/tunnelbroker/Dockerfile
34–36 ↗	(On Diff #9942)	I called it "docker" because these are scripts that are only meant to be run in the Docker container and are directly referenced and used in the Dockerfile. A directory called "scripts" generally indicates to me that they are tools that can be run on the host. For example, the `services/scripts` directory. I don't have a strong preference here though and would rename to "scripts" if you'd like.

Harbormaster completed remote builds in B7164: Diff 10090.Mar 4 2022, 1:54 PM

• karol accepted this revision.Mar 8 2022, 2:53 AM

• karol added inline comments.

services/tunnelbroker/Dockerfile
34–36 ↗	(On Diff #9942)	Yes, I understand. I'm deferring the final decision about naming to you, I still prefer something like "scripts" but it's ok.

Accept this. It makes sense to me to merge these two images now. Thanks, Jim.

This revision is now accepted and ready to land.Mar 9 2022, 4:25 AM

Herald added a reviewer: ashoat. · View Herald TranscriptMar 9 2022, 4:25 AM

This revision now requires review to proceed.Mar 9 2022, 4:25 AM

ashoat accepted this revision.Mar 10 2022, 8:08 AM

This revision is now accepted and ready to land.Mar 10 2022, 8:08 AM

ashoat added inline comments.Mar 10 2022, 8:08 AM

services/scripts/build_base_image.sh
5–8 ↗	(On Diff #10090)	Please stick with two-space tabs

Closed by commit rCOMM370381a0bf4c: tunnelbroker: Merge tunnelbroker-base and tunnelbroker-server images (authored by • jim). · Explain WhyMar 10 2022, 8:18 AM

This revision was automatically updated to reflect the committed changes.

• jim added a commit: rCOMM370381a0bf4c: tunnelbroker: Merge tunnelbroker-base and tunnelbroker-server images.

ashoat mentioned this in D3395: [services] Adjust tabs to be two spaces in build_base_image.sh.Mar 10 2022, 8:24 AM

• jim mentioned this in D3400: services: Fix mixed whitespace.Mar 10 2022, 12:04 PM

ashoat mentioned this in rCOMM4949e158866b: [services] Adjust tabs to be two spaces in build_base_image.sh.Mar 10 2022, 12:22 PM

• jim mentioned this in rCOMM1311033ad912: services: Fix mixed whitespace.Mar 10 2022, 12:31 PM

• jim mentioned this in D3481: [services] Remove blob base Docker image.Mar 21 2022, 12:37 PM

• jim mentioned this in D3485: [services] Backup - Remove backup base Docker image.Mar 21 2022, 1:35 PM

• jim mentioned this in rCOMM02198024f00d: [services] Remove blob base Docker image.Mar 22 2022, 8:13 AM

• karol mentioned this in rCOMMa5d1993c343c: [services] Backup - Remove backup base Docker image.Apr 27 2022, 2:37 AM

tunnelbroker: Merge tunnelbroker-base and tunnelbroker-server imagesClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 9753

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/Dockerfile

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/Dockerfile

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/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.h

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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.h

services/tunnelbroker/src/Amqp/AmqpManager.cpp

services/tunnelbroker/src/Constants.h

services/tunnelbroker/src/Database/DatabaseEntitiesTools.h

services/tunnelbroker/src/Database/DatabaseEntitiesTools.cpp

services/tunnelbroker/src/Database/DatabaseManager.h

services/tunnelbroker/src/Database/DatabaseManager.cpp

services/tunnelbroker/src/Database/DeviceSessionItem.h

services/tunnelbroker/src/Database/DeviceSessionItem.cpp

services/tunnelbroker/src/Database/Item.h

services/tunnelbroker/src/Database/MessageItem.h

services/tunnelbroker/src/Database/MessageItem.cpp

services/tunnelbroker/src/Database/PublicKeyItem.h

services/tunnelbroker/src/Database/PublicKeyItem.cpp

tunnelbroker: Merge tunnelbroker-base and tunnelbroker-server images
ClosedPublic
Actions

Revision Contents
Changeset List