Page MenuHomePhabricator
Differential D4858

[services] Fix docker base image
ClosedPublic
Actions

Authored by • karol on Aug 17 2022, 3:53 AM.
Tags
None
Referenced Files
F6149894: D4858.id15927.diff
Tue, Apr 22, 2:06 PM
F6149851: D4858.id15930.diff
Tue, Apr 22, 2:03 PM
F6148347: D4858.id15701.diff
Tue, Apr 22, 12:23 PM
F6146186: D4858.id.diff
Tue, Apr 22, 9:22 AM
Unknown Object (File)
Mon, Apr 21, 6:47 AM
Unknown Object (File)
Tue, Apr 8, 10:11 PM
Unknown Object (File)
Tue, Apr 1, 8:20 AM
Unknown Object (File)
Mar 19 2025, 7:30 PM
View All Files
Subscribers
• abosh
• adrian
ashoat
atul
tomek

Details

Reviewers
• jon
tomek
ashoat
Commits
rCOMMb1525900e127: [services] Fix docker base image
Summary

The current base image has probably not been built using this script which uses buildx and that caused it not to be compatible with the M1s.

This diff fixes that, I rebuilt the base image using the script and pushed it to the hub.

Test Plan

Clean docker, build one of the services (e.g. blob) on m1, and see that there's no amd64 label.

Diff Detail

Repository
rCOMM Comm
Branch
arcpatch-D4858_2
Lint
No Lint Coverage
Unit
No Test Coverage

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, 3:58 AM
• karol edited the test plan for this revision. (Show Details)
• karol added reviewers: • jon, tomek, ashoat.
• karol added a child revision: D4859: [services] Add curl to the base image.
Harbormaster completed remote builds in B11412: Diff 15701.Aug 17 2022, 4:02 AM
• karol requested review of this revision.Aug 17 2022, 4:02 AM
• max mentioned this in D4860: [services] Tunnelbroker - Move install corrosion script to lib.Aug 17 2022, 4:10 AM
• jon added a comment.Aug 17 2022, 6:52 AM

Do you mind updating the base image document? https://www.notion.so/commapp/Docker-base-image-publish-914aa735683444c9a98c5c9794f8d83a

Otherwise diff LGTM

• jon requested changes to this revision.Aug 17 2022, 6:52 AM
This revision now requires changes to proceed.Aug 17 2022, 6:52 AM
• karol requested review of this revision.Aug 18 2022, 4:11 AM
• karol added 1 blocking reviewer(s): tomek.

Ok, done

ashoat accepted this revision.Aug 18 2022, 6:46 AM
• jon accepted this revision.Aug 18 2022, 7:42 AM

Added comment about bumping of version tag, or else the push would fail

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 15927.Aug 24 2022, 7:12 AM

fix shellcheck

Harbormaster completed remote builds in B11585: Diff 15927.Aug 24 2022, 7:23 AM
Closed by commit rCOMMb1525900e127: [services] Fix docker base image (authored by • karol). · Explain WhyAug 24 2022, 8:13 AM
This revision was automatically updated to reflect the committed changes.
• karol added a commit: rCOMMb1525900e127: [services] Fix docker base image.

Revision Contents
Changeset List

PathSize
services/
backup/
2 lines
blob/
2 lines
scripts/
6 lines
tunnelbroker/
2 lines

Diff 15927

View Options

services/backup/Dockerfile

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { View } from 'react-native'; import { View } from 'react-native';
import type { ThreadInfo, SidebarInfo } from 'lib/types/thread-types'; import type {
ThreadInfo,
ThreadInfoWithLastUpdatedTimeAndNonLocalMessage,
} from 'lib/types/thread-types';
import ExtendedArrow from '../components/arrow-extended.react'; import ExtendedArrow from '../components/arrow-extended.react';
import Arrow from '../components/arrow.react'; import Arrow from '../components/arrow.react';
import Button from '../components/button.react'; import Button from '../components/button.react';
import UnreadDot from '../components/unread-dot.react'; import UnreadDot from '../components/unread-dot.react';
import { useColors, useStyles } from '../themes/colors'; import { useColors, useStyles } from '../themes/colors';
import { SidebarItem, sidebarHeight } from './sidebar-item.react'; import { SidebarItem, sidebarHeight } from './sidebar-item.react';
import SwipeableThread from './swipeable-thread.react'; import SwipeableThread from './swipeable-thread.react';
type Props = { type Props = {
+sidebarInfo: SidebarInfo, +sidebarInfo: ThreadInfoWithLastUpdatedTimeAndNonLocalMessage,
+onPressItem: (threadInfo: ThreadInfo) => void, +onPressItem: (threadInfo: ThreadInfo) => void,
+onSwipeableWillOpen: (threadInfo: ThreadInfo) => void, +onSwipeableWillOpen: (threadInfo: ThreadInfo) => void,
+currentlyOpenedSwipeableId: string, +currentlyOpenedSwipeableId: string,
+extendArrow: boolean, +extendArrow: boolean,
}; };
function ChatThreadListSidebar(props: Props): React.Node { function ChatThreadListSidebar(props: Props): React.Node {
const colors = useColors(); const colors = useColors();
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines
View Options

services/blob/Dockerfile

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { View } from 'react-native'; import { View } from 'react-native';
import type { ThreadInfo, SidebarInfo } from 'lib/types/thread-types'; import type {
ThreadInfo,
ThreadInfoWithLastUpdatedTimeAndNonLocalMessage,
} from 'lib/types/thread-types';
import ExtendedArrow from '../components/arrow-extended.react'; import ExtendedArrow from '../components/arrow-extended.react';
import Arrow from '../components/arrow.react'; import Arrow from '../components/arrow.react';
import Button from '../components/button.react'; import Button from '../components/button.react';
import UnreadDot from '../components/unread-dot.react'; import UnreadDot from '../components/unread-dot.react';
import { useColors, useStyles } from '../themes/colors'; import { useColors, useStyles } from '../themes/colors';
import { SidebarItem, sidebarHeight } from './sidebar-item.react'; import { SidebarItem, sidebarHeight } from './sidebar-item.react';
import SwipeableThread from './swipeable-thread.react'; import SwipeableThread from './swipeable-thread.react';
type Props = { type Props = {
+sidebarInfo: SidebarInfo, +sidebarInfo: ThreadInfoWithLastUpdatedTimeAndNonLocalMessage,
+onPressItem: (threadInfo: ThreadInfo) => void, +onPressItem: (threadInfo: ThreadInfo) => void,
+onSwipeableWillOpen: (threadInfo: ThreadInfo) => void, +onSwipeableWillOpen: (threadInfo: ThreadInfo) => void,
+currentlyOpenedSwipeableId: string, +currentlyOpenedSwipeableId: string,
+extendArrow: boolean, +extendArrow: boolean,
}; };
function ChatThreadListSidebar(props: Props): React.Node { function ChatThreadListSidebar(props: Props): React.Node {
const colors = useColors(); const colors = useColors();
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines
View Options

services/scripts/build_base_image.sh

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { View } from 'react-native'; import { View } from 'react-native';
import type { ThreadInfo, SidebarInfo } from 'lib/types/thread-types'; import type {
ThreadInfo,
ThreadInfoWithLastUpdatedTimeAndNonLocalMessage,
} from 'lib/types/thread-types';
import ExtendedArrow from '../components/arrow-extended.react'; import ExtendedArrow from '../components/arrow-extended.react';
import Arrow from '../components/arrow.react'; import Arrow from '../components/arrow.react';
import Button from '../components/button.react'; import Button from '../components/button.react';
import UnreadDot from '../components/unread-dot.react'; import UnreadDot from '../components/unread-dot.react';
import { useColors, useStyles } from '../themes/colors'; import { useColors, useStyles } from '../themes/colors';
import { SidebarItem, sidebarHeight } from './sidebar-item.react'; import { SidebarItem, sidebarHeight } from './sidebar-item.react';
import SwipeableThread from './swipeable-thread.react'; import SwipeableThread from './swipeable-thread.react';
type Props = { type Props = {
+sidebarInfo: SidebarInfo, +sidebarInfo: ThreadInfoWithLastUpdatedTimeAndNonLocalMessage,
+onPressItem: (threadInfo: ThreadInfo) => void, +onPressItem: (threadInfo: ThreadInfo) => void,
+onSwipeableWillOpen: (threadInfo: ThreadInfo) => void, +onSwipeableWillOpen: (threadInfo: ThreadInfo) => void,
+currentlyOpenedSwipeableId: string, +currentlyOpenedSwipeableId: string,
+extendArrow: boolean, +extendArrow: boolean,
}; };
function ChatThreadListSidebar(props: Props): React.Node { function ChatThreadListSidebar(props: Props): React.Node {
const colors = useColors(); const colors = useColors();
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines
View Options

services/tunnelbroker/Dockerfile

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { View } from 'react-native'; import { View } from 'react-native';
import type { ThreadInfo, SidebarInfo } from 'lib/types/thread-types'; import type {
ThreadInfo,
ThreadInfoWithLastUpdatedTimeAndNonLocalMessage,
} from 'lib/types/thread-types';
import ExtendedArrow from '../components/arrow-extended.react'; import ExtendedArrow from '../components/arrow-extended.react';
import Arrow from '../components/arrow.react'; import Arrow from '../components/arrow.react';
import Button from '../components/button.react'; import Button from '../components/button.react';
import UnreadDot from '../components/unread-dot.react'; import UnreadDot from '../components/unread-dot.react';
import { useColors, useStyles } from '../themes/colors'; import { useColors, useStyles } from '../themes/colors';
import { SidebarItem, sidebarHeight } from './sidebar-item.react'; import { SidebarItem, sidebarHeight } from './sidebar-item.react';
import SwipeableThread from './swipeable-thread.react'; import SwipeableThread from './swipeable-thread.react';
type Props = { type Props = {
+sidebarInfo: SidebarInfo, +sidebarInfo: ThreadInfoWithLastUpdatedTimeAndNonLocalMessage,
+onPressItem: (threadInfo: ThreadInfo) => void, +onPressItem: (threadInfo: ThreadInfo) => void,
+onSwipeableWillOpen: (threadInfo: ThreadInfo) => void, +onSwipeableWillOpen: (threadInfo: ThreadInfo) => void,
+currentlyOpenedSwipeableId: string, +currentlyOpenedSwipeableId: string,
+extendArrow: boolean, +extendArrow: boolean,
}; };
function ChatThreadListSidebar(props: Props): React.Node { function ChatThreadListSidebar(props: Props): React.Node {
const colors = useColors(); const colors = useColors();
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines