no Dockerfile user 1000

This commit is contained in:
Evan Feenstra 2023-01-23 16:36:34 -08:00
parent 93c9c4ec3a
commit 1fba40222e
6 changed files with 13 additions and 11 deletions

View file

@ -2,7 +2,8 @@ FROM node:16-buster-slim AS builder
WORKDIR /relay
RUN mkdir /relay/.lnd
COPY --chown=1000:1000 . .
COPY . .
# COPY --chown=1000:1000 . .
RUN apt-get update
@ -18,7 +19,7 @@ RUN npm install
RUN cp /relay/config/app.json /relay/dist/config/app.json
RUN cp /relay/config/config.json /relay/dist/config/config.json
RUN chown -R 1000:1000 /relay
# RUN chown -R 1000:1000 /relay
FROM node:16-buster-slim
@ -33,10 +34,10 @@ WORKDIR /relay
COPY --from=builder /relay .
EXPOSE 3300
# EXPOSE 3300
ENV NODE_ENV production
ENV NODE_SCHEME http
ENV PORT 3300
# ENV NODE_ENV production
# ENV NODE_SCHEME http
# ENV PORT 3300
CMD [ "node", "/relay/dist/app.js" ]

View file

@ -40,7 +40,7 @@ function initialAdminPubkey(req, res) {
try {
const contacts = (yield models_1.models.Contact.findAll());
if (contacts.length !== 1)
return (0, res_1.failure)(res, 'too late');
return (0, res_1.failure)(res, 'too late' + contacts.length);
const admin = contacts[0];
if (admin.authToken || admin.contactKey)
return (0, res_1.failure)(res, 'too late');

View file

@ -1 +1 @@
{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../../src/controllers/admin.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAA+C;AAE/C,0CAA6E;AAC7E,sCAAuD;AAEvD,SAAsB,QAAQ,CAAC,GAAQ,EAAE,GAAQ;;QAC/C,IAAI,CAAC,IAAA,eAAO,GAAE;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAA;QAChD,IAAI;YACF,MAAM,KAAK,GAAkB,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;gBACzD,KAAK,EAAE;oBACL,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,IAAI;iBACd;aACF,CAAC,CAAkB,CAAA;YACpB,IAAA,aAAO,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;SACnC;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,aAAO,EAAC,GAAG,EAAE,CAAC,CAAC,CAAA;SAChB;IACH,CAAC;CAAA;AAbD,4BAaC;AAED,wDAAwD;AACxD,SAAsB,kBAAkB,CAAC,GAAQ,EAAE,GAAQ;;QACzD,IAAI,CAAC,IAAA,eAAO,GAAE;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAA;QAChD,IAAI;YACF,MAAM,QAAQ,GAAG,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAoB,CAAA;YACpE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;YAC1D,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;YACzB,IAAI,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,UAAU;gBAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;YACxE,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAA;YAC9B,IAAA,aAAO,EAAC,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;SACzB;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,aAAO,EAAC,GAAG,EAAE,CAAC,CAAC,CAAA;SAChB;IACH,CAAC;CAAA;AAZD,gDAYC;AAED,SAAsB,mBAAmB,CAAC,GAAQ,EAAE,GAAQ;;QAC1D,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAC/C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAA;QACxD,IAAI,CAAC,IAAA,eAAO,GAAE;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAA;QAEhD,MAAM,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAClC,IAAI,CAAC,EAAE;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,iBAAiB,CAAC,CAAA;QAC/C,IAAI;YACF,MAAM,IAAI,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBACtC,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE;aACpC,CAAC,CAAS,CAAA;YACX,IAAI,CAAC,IAAI;gBAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,gBAAgB,CAAC,CAAA;YAChD,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;YACxC,IAAA,aAAO,EAAC,GAAG,EAAE,IAAI,CAAC,CAAA;SACnB;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,aAAO,EAAC,GAAG,EAAE,CAAC,CAAC,CAAA;SAChB;IACH,CAAC;CAAA;AAjBD,kDAiBC;AAED,SAAsB,sBAAsB,CAC1C,GAAQ,EACR,GAAQ;;QAER,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAC/C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAA;QACxD,IAAI,CAAC,IAAA,eAAO,GAAE;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAA;QAEhD,MAAM,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAClC,IAAI,CAAC,EAAE;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,iBAAiB,CAAC,CAAA;QAC/C,IAAI;YACF,MAAM,IAAI,GAAG,CAAC,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBACtC,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE;aACpC,CAAC,CAAS,CAAA;YACX,IAAI,CAAC,IAAI;gBAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,gBAAgB,CAAC,CAAA;YAChD,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAA;YACzC,IAAA,aAAO,EAAC,GAAG,EAAE,IAAI,CAAC,CAAA;SACnB;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,aAAO,EAAC,GAAG,EAAE,CAAC,CAAC,CAAA;SAChB;IACH,CAAC;CAAA;AApBD,wDAoBC;AAED,SAAsB,YAAY,CAAC,GAAQ,EAAE,GAAQ;;QACnD,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAC/C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAA;QACxD,IAAI,CAAC,IAAA,eAAO,GAAE;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAA;QAEhD,IAAI;YACF,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAC5C,MAAM,GAAG,GAAG,MAAM,IAAA,0BAAkB,GAAE,CAAA;YACtC,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAe,EAAC,GAAG,EAAE,WAAW,IAAI,CAAC,CAAC,CAAA;YAC5D,IAAA,aAAO,EAAC,GAAG,EAAE,OAAO,CAAC,CAAA;SACtB;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,aAAO,EAAC,GAAG,EAAE,CAAC,CAAC,CAAA;SAChB;IACH,CAAC;CAAA;AAbD,oCAaC;AAED,SAAsB,SAAS,CAAC,GAAQ,EAAE,GAAQ;;QAChD,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QAC/C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAA;QACxD,IAAI,CAAC,IAAA,eAAO,GAAE;YAAE,OAAO,IAAA,aAAO,EAAC,GAAG,EAAE,WAAW,CAAC,CAAA;QAEhD,IAAI;YACF,MAAM,KAAK,GAAoB,CAAC,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC3D,KAAK,EAAE;oBACL,OAAO,EAAE,IAAI;iBACd;aACF,CAAC,CAAoB,CAAA;YACtB,IAAA,aAAO,EAAC,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;SACxB;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,aAAO,EAAC,GAAG,EAAE,CAAC,CAAC,CAAA;SAChB;IACH,CAAC;CAAA;AAfD,8BAeC"}
{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../../src/controllers/admin.ts"],"names":[],"mappings":"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"}

View file

@ -259,7 +259,7 @@ function joinDefaultTribes(owner, admin) {
const defaultTribes = (yield models_1.models.Chat.findAll({
where: { defaultJoin: true },
}));
helpers.asyncForEach(defaultTribes, (t) => __awaiter(this, void 0, void 0, function* () {
yield helpers.asyncForEach(defaultTribes, (t) => __awaiter(this, void 0, void 0, function* () {
const body = {
uuid: t.uuid,
group_key: t.groupKey,
@ -267,6 +267,7 @@ function joinDefaultTribes(owner, admin) {
amount: t.priceToJoin,
img: t.photoUrl,
owner_pubkey: t.ownerPubkey,
private: t.private,
owner_route_hint: admin.routeHint,
owner_alias: admin.alias,
};

File diff suppressed because one or more lines are too long

View file

@ -23,7 +23,7 @@ export async function initialAdminPubkey(req: Req, res: Res): Promise<void> {
if (!isProxy()) return failure(res, 'not proxy')
try {
const contacts = (await models.Contact.findAll()) as ContactRecord[]
if (contacts.length !== 1) return failure(res, 'too late')
if (contacts.length !== 1) return failure(res, 'too late' + contacts.length)
const admin = contacts[0]
if (admin.authToken || admin.contactKey) return failure(res, 'too late')
const pubkey = admin.publicKey