Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(skeleton): files only refactored from discounts #1

Merged
merged 3 commits into from
Nov 9, 2020
Merged

Conversation

WikiRik
Copy link
Member

@WikiRik WikiRik commented Nov 7, 2020

Not a working system, but these files should only be refactored stuff. Still would be nice if you could take a small look at it

@WikiRik WikiRik marked this pull request as draft November 7, 2020 19:19
@WikiRik WikiRik marked this pull request as ready for review November 7, 2020 19:24
@WikiRik
Copy link
Member Author

WikiRik commented Nov 7, 2020

@serge1peshcoff I will rebase #2 after you've approved this so it's more clear there what I've changed

which node && node -v
- run: npm install
- run: npx semantic-release
- run: docker build --tag aegee/network:$(node -p "require('./package.json').version") --tag aegee/network:latest -f ./docker/network/Dockerfile .
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for this to work on CI, you'll need to set env variables for docker login, github token and slack token for notifications, and also give aegeedeployer permission to push to aegee/network.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you do this for me? I don't have the permissions/information to do this

- "traefik.backend=network"
- "traefik.port=8084"
- "traefik.auth.frontend.rule=PathPrefix:/api/network/metrics;PathPrefixStrip:/api/network;"
- "traefik.new.frontend.rule=PathPrefixStrip:/api/network;"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe it makes sense to rename it to something like "all" or "general", as we don't have "old" anymore (/services/oms-network/api

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to just not mention it at all but that broke Traefik, I'll just leave new here until we refactor it for all modules

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not mentioning it will not work, I assume because it will just apply this rule to all frontends (including auth)

ENV PATH="/home/node/.npm-global/bin:${PATH}"

RUN npm install -g --loglevel warn nodemon bunyan && npm cache clean --force
RUN npm install --loglevel warn
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check out this thread: https://myaegee.slack.com/archives/C45Q9DTMK/p1603991345073800, maybe we can make it nice from the start

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FROM node:12

RUN mkdir -p /usr/app/src \
	&& mkdir -p /usr/app/media \
	&& mkdir -p /usr/app/scripts

COPY --chown=node:node package.json /usr/app/src

ENV NPM_CONFIG_PREFIX=/home/node/.npm-global
ENV PATH="/home/node/.npm-global/bin:${PATH}"

RUN npm install -g --loglevel warn nodemon bunyan && npm cache clean --force
RUN npm install --loglevel warn

COPY . /usr/app/src

RUN chown -R node:node /usr/app

USER node

COPY ./docker/network/bootstrap.sh /usr/app/scripts/bootstrap.sh

CMD sh /usr/app/scripts/bootstrap.sh && npm start

EXPOSE 8084

Like this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@linuxbandit you might also be interested in this

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should do it I think

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I'll add some touches later as this is merged already but it is good overall

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good!

Copy link
Member

@serge1peshcoff serge1peshcoff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, check my comments

Copy link
Member

@serge1peshcoff serge1peshcoff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm in general

@serge1peshcoff
Copy link
Member

🎉 This PR is included in version 1.0.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants