Page MenuHomePhabricator
Differential D4860

[services] Tunnelbroker - Move install corrosion script to lib
ClosedPublic
Actions

Authored by • karol on Aug 17 2022, 3:53 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 19, 9:56 PM
Unknown Object (File)
Mon, Mar 17, 7:34 AM
Unknown Object (File)
Sun, Mar 16, 7:17 AM
Unknown Object (File)
Sun, Mar 16, 7:17 AM
Unknown Object (File)
Sat, Mar 15, 9:12 PM
Unknown Object (File)
Tue, Mar 11, 9:39 PM
Unknown Object (File)
Thu, Mar 6, 5:05 AM
Unknown Object (File)
Thu, Mar 6, 2:00 AM
View All Files
Subscribers
• abosh
• adrian
ashoat
atul
• jon
tomek

Details

Reviewers
tomek
• max
• jon
Commits
rCOMMbed184d6e34b: [services] Tunnelbroker - Move install corrosion script to lib
Summary

Depends on D4859

I will be using corrosion in the backup service so I moved the script to install it to the mutual space: lib.

Test Plan

tunnelbroker still builds

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

• karol created this revision.Aug 17 2022, 3:53 AM
Herald added subscribers: • abosh, atul, • adrian and 2 others. · View Herald TranscriptAug 17 2022, 3:53 AM
• karol edited the summary of this revision. (Show Details)Aug 17 2022, 4:00 AM
• karol edited the test plan for this revision. (Show Details)
• karol added reviewers: tomek, • max.
• karol added a parent revision: D4859: [services] Add curl to the base image.
Harbormaster completed remote builds in B11414: Diff 15703.Aug 17 2022, 4:03 AM
• karol requested review of this revision.Aug 17 2022, 4:03 AM
• max accepted this revision.Aug 17 2022, 4:10 AM

This diff shouldn't depend on D4859 and D4858. Seems that it's independent and the Tunnelbroker is successfully built without the parent diffs.

This revision is now accepted and ready to land.Aug 17 2022, 4:10 AM
• karol added a child revision: D4861: [services] Backup - Add Rust.Aug 17 2022, 4:11 AM
• karol added 1 blocking reviewer(s): tomek.Aug 18 2022, 4:11 AM
This revision now requires review to proceed.Aug 18 2022, 4:11 AM
ashoat added a reviewer: • jon.Aug 18 2022, 6:48 AM
ashoat added a subscriber: • jon.

Adding @jon since I know he's been looking at these "install" bash scripts

• jon accepted this revision.EditedAug 18 2022, 7:46 AM

if it's going to be used in more than once service, I think this makes sense.

I think it would make even more sense to just have all of the scripts in a single directory for services as they are more of a concern of docker than any service, but that's out of scope.

tomek accepted this revision.Aug 18 2022, 10:36 AM
This revision is now accepted and ready to land.Aug 18 2022, 10:36 AM
• karol updated this revision to Diff 15932.Aug 24 2022, 8:16 AM
• karol edited the summary of this revision. (Show Details)

rebase

This revision was landed with ongoing or failed builds.Aug 24 2022, 8:16 AM
Closed by commit rCOMMbed184d6e34b: [services] Tunnelbroker - Move install corrosion script to lib (authored by • karol). · Explain Why
This revision was automatically updated to reflect the committed changes.
• karol added a commit: rCOMMbed184d6e34b: [services] Tunnelbroker - Move install corrosion script to lib.
Harbormaster completed remote builds in B11588: Diff 15932.Aug 24 2022, 8:26 AM

Revision Contents
Changeset List

PathSize
services/
lib/
docker/
tunnelbroker/
docker/
tunnelbroker/
2 lines
docker/

Diff 15933

View Options

services/lib/docker/install_corrosion.sh

Show First 20 Lines • Show All 715 Lines • ▼ Show 20 Lines steps.push({
inputFilename: filename, inputFilename: filename,
outputMediaType: uploadResult && uploadResult.mediaType, outputMediaType: uploadResult && uploadResult.mediaType,
outputURI: uploadResult && uploadResult.uri, outputURI: uploadResult && uploadResult.uri,
outputDimensions: uploadResult && uploadResult.dimensions, outputDimensions: uploadResult && uploadResult.dimensions,
outputLoop: uploadResult && uploadResult.loop, outputLoop: uploadResult && uploadResult.loop,
hasWiFi, hasWiFi,
}); });
const promises = []; const cleanupPromises = [];
if (shouldDisposePath) { if (shouldDisposePath) {
// If processMedia needed to do any transcoding before upload, we dispose // If processMedia needed to do any transcoding before upload, we dispose
// of the resultant temporary file here. Since the transcoded temporary // of the resultant temporary file here. Since the transcoded temporary
// file is only used for upload, we can dispose of it after processMedia // file is only used for upload, we can dispose of it after processMedia
// (reportPromise) and the upload are complete // (reportPromise) and the upload are complete
promises.push( cleanupPromises.push(
(async () => { (async () => {
const disposeStep = await disposeTempFile(shouldDisposePath); const disposeStep = await disposeTempFile(shouldDisposePath);
steps.push(disposeStep); steps.push(disposeStep);
})(), })(),
); );
} }
// if there's a thumbnail we'll temporarily unlink it here // if there's a thumbnail we'll temporarily unlink it here
// instead of in media-utils, will be changed in later diffs // instead of in media-utils, will be changed in later diffs
if (processedMedia.mediaType === 'video') { if (processedMedia.mediaType === 'video') {
const { uploadThumbnailURI } = processedMedia; const { uploadThumbnailURI } = processedMedia;
promises.push( cleanupPromises.push(
(async () => { (async () => {
const disposeStep = await disposeTempFile(uploadThumbnailURI); const disposeStep = await disposeTempFile(uploadThumbnailURI);
steps.push(disposeStep); steps.push(disposeStep);
})(), })(),
); );
} }
if (selection.captureTime || selection.step === 'photo_paste') { if (selection.captureTime || selection.step === 'photo_paste') {
// If we are uploading a newly captured photo, we dispose of the original // If we are uploading a newly captured photo, we dispose of the original
// file here. Note that we try to save photo captures to the camera roll // file here. Note that we try to save photo captures to the camera roll
// if we have permission. Even if we fail, this temporary file isn't // if we have permission. Even if we fail, this temporary file isn't
// visible to the user, so there's no point in keeping it around. Since // visible to the user, so there's no point in keeping it around. Since
// the initial URI is used in rendering paths, we have to wait for it to // the initial URI is used in rendering paths, we have to wait for it to
// be replaced with the remote URI before we can dispose. Check out the // be replaced with the remote URI before we can dispose. Check out the
// Multimedia component to see how the URIs get switched out. // Multimedia component to see how the URIs get switched out.
const captureURI = selection.uri; const captureURI = selection.uri;
promises.push( cleanupPromises.push(
(async () => { (async () => {
const { const {
steps: clearSteps, steps: clearSteps,
result: capturePath, result: capturePath,
} = await this.waitForCaptureURIUnload(captureURI); } = await this.waitForCaptureURIUnload(captureURI);
steps.push(...clearSteps); steps.push(...clearSteps);
if (!capturePath) { if (!capturePath) {
return; return;
} }
const disposeStep = await disposeTempFile(capturePath); const disposeStep = await disposeTempFile(capturePath);
steps.push(disposeStep); steps.push(disposeStep);
})(), })(),
); );
} }
await Promise.all(promises); await Promise.all(cleanupPromises);
return await onUploadFinished(mediaMissionResult); return await onUploadFinished(mediaMissionResult);
} }
mediaProcessConfig(localMessageID: string, localID: string) { mediaProcessConfig(localMessageID: string, localID: string) {
const { hasWiFi, viewerID } = this.props; const { hasWiFi, viewerID } = this.props;
const onTranscodingProgress = (percent: number) => { const onTranscodingProgress = (percent: number) => {
this.setProgress(localMessageID, localID, 'transcoding', percent); this.setProgress(localMessageID, localID, 'transcoding', percent);
▲ Show 20 Lines • Show All 579 Lines • Show Last 20 Lines
View Options

services/tunnelbroker/Dockerfile

Show First 20 Lines • Show All 715 Lines • ▼ Show 20 Lines steps.push({
inputFilename: filename, inputFilename: filename,
outputMediaType: uploadResult && uploadResult.mediaType, outputMediaType: uploadResult && uploadResult.mediaType,
outputURI: uploadResult && uploadResult.uri, outputURI: uploadResult && uploadResult.uri,
outputDimensions: uploadResult && uploadResult.dimensions, outputDimensions: uploadResult && uploadResult.dimensions,
outputLoop: uploadResult && uploadResult.loop, outputLoop: uploadResult && uploadResult.loop,
hasWiFi, hasWiFi,
}); });
const promises = []; const cleanupPromises = [];
if (shouldDisposePath) { if (shouldDisposePath) {
// If processMedia needed to do any transcoding before upload, we dispose // If processMedia needed to do any transcoding before upload, we dispose
// of the resultant temporary file here. Since the transcoded temporary // of the resultant temporary file here. Since the transcoded temporary
// file is only used for upload, we can dispose of it after processMedia // file is only used for upload, we can dispose of it after processMedia
// (reportPromise) and the upload are complete // (reportPromise) and the upload are complete
promises.push( cleanupPromises.push(
(async () => { (async () => {
const disposeStep = await disposeTempFile(shouldDisposePath); const disposeStep = await disposeTempFile(shouldDisposePath);
steps.push(disposeStep); steps.push(disposeStep);
})(), })(),
); );
} }
// if there's a thumbnail we'll temporarily unlink it here // if there's a thumbnail we'll temporarily unlink it here
// instead of in media-utils, will be changed in later diffs // instead of in media-utils, will be changed in later diffs
if (processedMedia.mediaType === 'video') { if (processedMedia.mediaType === 'video') {
const { uploadThumbnailURI } = processedMedia; const { uploadThumbnailURI } = processedMedia;
promises.push( cleanupPromises.push(
(async () => { (async () => {
const disposeStep = await disposeTempFile(uploadThumbnailURI); const disposeStep = await disposeTempFile(uploadThumbnailURI);
steps.push(disposeStep); steps.push(disposeStep);
})(), })(),
); );
} }
if (selection.captureTime || selection.step === 'photo_paste') { if (selection.captureTime || selection.step === 'photo_paste') {
// If we are uploading a newly captured photo, we dispose of the original // If we are uploading a newly captured photo, we dispose of the original
// file here. Note that we try to save photo captures to the camera roll // file here. Note that we try to save photo captures to the camera roll
// if we have permission. Even if we fail, this temporary file isn't // if we have permission. Even if we fail, this temporary file isn't
// visible to the user, so there's no point in keeping it around. Since // visible to the user, so there's no point in keeping it around. Since
// the initial URI is used in rendering paths, we have to wait for it to // the initial URI is used in rendering paths, we have to wait for it to
// be replaced with the remote URI before we can dispose. Check out the // be replaced with the remote URI before we can dispose. Check out the
// Multimedia component to see how the URIs get switched out. // Multimedia component to see how the URIs get switched out.
const captureURI = selection.uri; const captureURI = selection.uri;
promises.push( cleanupPromises.push(
(async () => { (async () => {
const { const {
steps: clearSteps, steps: clearSteps,
result: capturePath, result: capturePath,
} = await this.waitForCaptureURIUnload(captureURI); } = await this.waitForCaptureURIUnload(captureURI);
steps.push(...clearSteps); steps.push(...clearSteps);
if (!capturePath) { if (!capturePath) {
return; return;
} }
const disposeStep = await disposeTempFile(capturePath); const disposeStep = await disposeTempFile(capturePath);
steps.push(disposeStep); steps.push(disposeStep);
})(), })(),
); );
} }
await Promise.all(promises); await Promise.all(cleanupPromises);
return await onUploadFinished(mediaMissionResult); return await onUploadFinished(mediaMissionResult);
} }
mediaProcessConfig(localMessageID: string, localID: string) { mediaProcessConfig(localMessageID: string, localID: string) {
const { hasWiFi, viewerID } = this.props; const { hasWiFi, viewerID } = this.props;
const onTranscodingProgress = (percent: number) => { const onTranscodingProgress = (percent: number) => {
this.setProgress(localMessageID, localID, 'transcoding', percent); this.setProgress(localMessageID, localID, 'transcoding', percent);
▲ Show 20 Lines • Show All 579 Lines • Show Last 20 Lines
View Options

services/tunnelbroker/docker/install_corrosion.sh

Show First 20 Lines • Show All 715 Lines • ▼ Show 20 Lines steps.push({
inputFilename: filename, inputFilename: filename,
outputMediaType: uploadResult && uploadResult.mediaType, outputMediaType: uploadResult && uploadResult.mediaType,
outputURI: uploadResult && uploadResult.uri, outputURI: uploadResult && uploadResult.uri,
outputDimensions: uploadResult && uploadResult.dimensions, outputDimensions: uploadResult && uploadResult.dimensions,
outputLoop: uploadResult && uploadResult.loop, outputLoop: uploadResult && uploadResult.loop,
hasWiFi, hasWiFi,
}); });
const promises = []; const cleanupPromises = [];
if (shouldDisposePath) { if (shouldDisposePath) {
// If processMedia needed to do any transcoding before upload, we dispose // If processMedia needed to do any transcoding before upload, we dispose
// of the resultant temporary file here. Since the transcoded temporary // of the resultant temporary file here. Since the transcoded temporary
// file is only used for upload, we can dispose of it after processMedia // file is only used for upload, we can dispose of it after processMedia
// (reportPromise) and the upload are complete // (reportPromise) and the upload are complete
promises.push( cleanupPromises.push(
(async () => { (async () => {
const disposeStep = await disposeTempFile(shouldDisposePath); const disposeStep = await disposeTempFile(shouldDisposePath);
steps.push(disposeStep); steps.push(disposeStep);
})(), })(),
); );
} }
// if there's a thumbnail we'll temporarily unlink it here // if there's a thumbnail we'll temporarily unlink it here
// instead of in media-utils, will be changed in later diffs // instead of in media-utils, will be changed in later diffs
if (processedMedia.mediaType === 'video') { if (processedMedia.mediaType === 'video') {
const { uploadThumbnailURI } = processedMedia; const { uploadThumbnailURI } = processedMedia;
promises.push( cleanupPromises.push(
(async () => { (async () => {
const disposeStep = await disposeTempFile(uploadThumbnailURI); const disposeStep = await disposeTempFile(uploadThumbnailURI);
steps.push(disposeStep); steps.push(disposeStep);
})(), })(),
); );
} }
if (selection.captureTime || selection.step === 'photo_paste') { if (selection.captureTime || selection.step === 'photo_paste') {
// If we are uploading a newly captured photo, we dispose of the original // If we are uploading a newly captured photo, we dispose of the original
// file here. Note that we try to save photo captures to the camera roll // file here. Note that we try to save photo captures to the camera roll
// if we have permission. Even if we fail, this temporary file isn't // if we have permission. Even if we fail, this temporary file isn't
// visible to the user, so there's no point in keeping it around. Since // visible to the user, so there's no point in keeping it around. Since
// the initial URI is used in rendering paths, we have to wait for it to // the initial URI is used in rendering paths, we have to wait for it to
// be replaced with the remote URI before we can dispose. Check out the // be replaced with the remote URI before we can dispose. Check out the
// Multimedia component to see how the URIs get switched out. // Multimedia component to see how the URIs get switched out.
const captureURI = selection.uri; const captureURI = selection.uri;
promises.push( cleanupPromises.push(
(async () => { (async () => {
const { const {
steps: clearSteps, steps: clearSteps,
result: capturePath, result: capturePath,
} = await this.waitForCaptureURIUnload(captureURI); } = await this.waitForCaptureURIUnload(captureURI);
steps.push(...clearSteps); steps.push(...clearSteps);
if (!capturePath) { if (!capturePath) {
return; return;
} }
const disposeStep = await disposeTempFile(capturePath); const disposeStep = await disposeTempFile(capturePath);
steps.push(disposeStep); steps.push(disposeStep);
})(), })(),
); );
} }
await Promise.all(promises); await Promise.all(cleanupPromises);
return await onUploadFinished(mediaMissionResult); return await onUploadFinished(mediaMissionResult);
} }
mediaProcessConfig(localMessageID: string, localID: string) { mediaProcessConfig(localMessageID: string, localID: string) {
const { hasWiFi, viewerID } = this.props; const { hasWiFi, viewerID } = this.props;
const onTranscodingProgress = (percent: number) => { const onTranscodingProgress = (percent: number) => {
this.setProgress(localMessageID, localID, 'transcoding', percent); this.setProgress(localMessageID, localID, 'transcoding', percent);
▲ Show 20 Lines • Show All 579 Lines • Show Last 20 Lines