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

Shippingservice rust #179

Merged
merged 20 commits into from
Jul 13, 2022
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
.github
docs
internal

###################################
# shippingservice
./src/shippingservice/target
###################################

###################################
# currencyservice
./src/currencyservice/client.js
./src/currencyservice/node_modules/
###################################

###################################
# featureflagservice
# Common development/test artifacts
./src/featureflagservice/cover/
./src/featureflagservice/doc/
./src/featureflagservice/test/
./src/featureflagservice/tmp/
./src/featureflagservice/.elixir_ls

# Mix artifacts
./src/featureflagservice/_build/
./src/featureflagservice/deps/
./src/featureflagservice/*.ez

# Generated on crash by the VM
./src/featureflagservice/erl_crash.dump

# Static artifacts - These should be fetched and built inside the Docker image
./src/featureflagservice/assets/node_modules/
./src/featureflagservice/priv/static/assets/
./src/featureflagservice/priv/static/cache_manifest.json
###################################

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ obj/
.idea/
build/
node_modules/
src/shippingservice/target/
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,7 @@ release.
([#26](https://github.com/open-telemetry/opentelemetry-demo-webstore/pull/26))
* Added span attributes to frontend service
([#82](https://github.com/open-telemetry/opentelemetry-demo-webstore/pull/82))
* Rewrote shipping service in Rust
([#35](https://github.com/open-telemetry/opentelemetry-demo-webstore/issues/35))
* Added feature flag service implementation
([#141](https://github.com/open-telemetry/opentelemetry-demo-webstore/pull/141))
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ services:
shippingservice:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-shippingservice
build:
context: ./src/shippingservice
context: ./
dockerfile: ./src/shippingservice/Dockerfile
ports:
- "${SHIPPING_SERVICE_PORT}"
environment:
Expand Down
2 changes: 1 addition & 1 deletion src/loadgenerator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM python:3.10-slim AS base
FROM python:3.10 AS base

WORKDIR /usr/src/app/

Expand Down
3 changes: 2 additions & 1 deletion src/shippingservice/.dockerignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
vendor/
target/
Dockerfile
Loading